patch 9.0.1712: missing null check in object_clear()

Problem: missing null check in object_clear()
Solution: Add null check of cl

closes: #12627

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Jia-Ju Bai <baijiaju@buaa.edu.cn>

diff --git a/src/version.c b/src/version.c
index 3a7d4bb4db99a8fed4b4b0db1641a65cb83d7789..45f5527d190d9e52083d888b6d64e5f31199d9e4 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 */
+/**/
+    1712,
 /**/
     1711,
 /**/

diff --git a/src/vim9class.c b/src/vim9class.c
index 2f2422871a59da5b87f26a5d32dac7d85f89cdfd..562db25b5d59c2b24ca2f18121ab18e0e92a6b1c 100644 (file)
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -1509,6 +1509,9 @@ object_clear(object_T *obj)
 
     class_T *cl = obj->obj_class;
 
+    if (!cl)
+        return;
+
     // the member values are just after the object structure
     typval_T *tv = (typval_T *)(obj + 1);
     for (int i = 0; i < cl->class_obj_member_count; ++i)