diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-08-13 10:19:38 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-13 10:19:38 +0200 |
| commit | 57a02ccf4c75a6abb270194c90be926d5221b3ce (patch) | |
| tree | 172ea7c80c0b596ff00aaf33441232436f6af4a6 | |
| parent | 32f586eec1a48784566f8e7aad5cab0ad6105b02 (diff) | |
patch 9.0.1701: vim9 crash when class member overriddenv9.0.1701
Problem: vim9 crash when class member overridden
Solution: Use method_count field instead
closes: #12676
closes: #12677
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
| -rw-r--r-- | src/testdir/test_vim9_class.vim | 38 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9class.c | 2 |
3 files changed, 41 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index f1acdf38ef..4936c5320c 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -1874,5 +1874,43 @@ def Test_defer_with_object() unlet g:result enddef +" The following test used to crash Vim (Github issue #12676) +def Test_extends_method_crashes_vim() + var lines =<< trim END + vim9script + + class Observer + endclass + + class Property + this.value: any + + def Set(v: any) + if v != this.value + this.value = v + endif + enddef + + def Register(observer: Observer) + enddef + endclass + + class Bool extends Property + this.value: bool + endclass + + def Observe(obj: Property, who: Observer) + obj.Register(who) + enddef + + var p = Bool.new(false) + var myObserver = Observer.new() + + Observe(p, myObserver) + + p.Set(true) + END + v9.CheckScriptSuccess(lines) +enddef " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index ad0b854e03..ddae454031 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1701, +/**/ 1700, /**/ 1699, diff --git a/src/vim9class.c b/src/vim9class.c index 12b09677b0..18f36bdb4c 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -897,7 +897,7 @@ early_ret: if (!done && extends_cl != NULL) { for (int cl_i = 0; - cl_i < extends_cl->class_obj_member_count; ++cl_i) + cl_i < extends_cl->class_obj_method_count; ++cl_i) { if (STRCMP(ifcl->class_obj_methods[if_i]->uf_name, extends_cl->class_obj_methods[cl_i]->uf_name) |