patch 9.0.1701: vim9 crash when class member overridden

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>

diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index f1acdf38efcf009f56b69cf7342dbc0d8c44fe01..4936c5320cd40578e4405789b501f3d61f5dc0fb 100644 (file)
--- 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 ad0b854e03986972ed243416a10490ca35bebdbf..ddae4540314962ada511606a62e54b59a32c82ee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1701,
 /**/
     1700,
 /**/

diff --git a/src/vim9class.c b/src/vim9class.c
index 12b09677b0be3fe9a1cef5ddf0bb5f875e2458c0..18f36bdb4c469b71cb4e18a0f44003f6e1852c55 100644 (file)
--- 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)