patch 9.0.1988: Vim9: potential use-after-free for class members
Commit:
https://github.com/vim/vim/commit/d2f4800099733216e28d59e1a5710f624b0d9ec1
Author: Yegappan Lakshmanan <yegap...@yahoo.com>
Date: Thu Oct 5 20:24:18 2023 +0200
patch 9.0.1988: Vim9: potential use-after-free for class members
Problem: Vim9: potential use-after-free for class members
Solution: Use the class-related grow array for storing the
member type instead of using a temporary type
list grow array
Use the type list grow array associated with the class than using a
temporary type list grow array to allocate the class member type.
For simple types, a predefined type is used. For complex types, the type
is dynamically allocated from a grow array. For class variables, the
type grow array in the class should be used. So that the lifetime of the
type is same as the lifetime of the class.
closes: #13279
Signed-off-by: Christian Brabandt <c...@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegap...@yahoo.com>
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 3226de1c6..dc539aca4 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -6483,26 +6483,26 @@ func Test_class_variable_complex_type_check()
" script level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public static Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
endclass
test_garbagecollect_now()
A.Fn = "abc"
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 9)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 9)
" class variable with a specific type. Try assigning a different type at
" class def method level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public static Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
def Bar()
Fn = "abc"
enddef
@@ -6511,17 +6511,17 @@ func Test_class_variable_complex_type_check()
test_garbagecollect_now()
a.Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" class variable with a specific type. Try assigning a different type at
" script def method level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public static Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
endclass
def Bar()
A.Fn = "abc"
@@ -6529,13 +6529,13 @@ func Test_class_variable_complex_type_check()
test_garbagecollect_now()
Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" class variable without any type. Should be set to the initialization
" expression type. Try assigning a different type from script level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6544,13 +6544,13 @@ func Test_class_variable_complex_type_check()
test_garbagecollect_now()
A.Fn = "abc"
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 9)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 9)
" class variable without any type. Should be set to the initialization
" expression type. Try assigning a different type at class def level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6563,13 +6563,13 @@ func Test_class_variable_complex_type_check()
test_garbagecollect_now()
a.Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" class variable without any type. Should be set to the initialization
" expression type. Try assigning a different type at script def level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6581,12 +6581,12 @@ func Test_class_variable_complex_type_check()
test_garbagecollect_now()
Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" class variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6594,13 +6594,13 @@ func Test_class_variable_complex_type_check()
public static Fn2: any
endclass
test_garbagecollect_now()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(A.Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn))
A.Fn = "abc"
test_garbagecollect_now()
assert_equal('string', typename(A.Fn))
A.Fn2 = Foo
test_garbagecollect_now()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(A.Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn2))
A.Fn2 = "xyz"
test_garbagecollect_now()
assert_equal('string', typename(A.Fn2))
@@ -6610,7 +6610,7 @@ func Test_class_variable_complex_type_check()
" class variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6618,11 +6618,11 @@ func Test_class_variable_complex_type_check()
public static Fn2: any
def Bar()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(Fn))
Fn = "abc"
assert_equal('string', typename(Fn))
Fn2 = Foo
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(Fn2))
Fn2 = "xyz"
assert_equal('string', typename(Fn2))
enddef
@@ -6639,7 +6639,7 @@ func Test_class_variable_complex_type_check()
" class variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6648,11 +6648,11 @@ func Test_class_variable_complex_type_check()
endclass
def Bar()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(A.Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn))
A.Fn = "abc"
assert_equal('string', typename(A.Fn))
A.Fn2 = Foo
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(A.Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn2))
A.Fn2 = "xyz"
assert_equal('string', typename(A.Fn2))
enddef
@@ -6662,6 +6662,19 @@ func Test_class_variable_complex_type_check()
Bar()
END
call v9.CheckSourceSuccess(lines)
+
+ let lines =<< trim END
+ vim9script
+ class A
+ public static foo = [0z10, 0z20]
+ endclass
+ assert_equal([0z10, 0z20], A.foo)
+ A.foo = [0z30]
+ assert_equal([0z30], A.foo)
+ var a = A.foo
+ assert_equal([0z30], a)
+ END
+ call v9.CheckSourceSuccess(lines)
endfunc
" Test type checking for object variable in assignments
@@ -6670,27 +6683,27 @@ func Test_object_variable_complex_type_check()
" script level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public this.Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
endclass
var a = A.new()
test_garbagecollect_now()
a.Fn = "abc"
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 10)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 10)
" object variable with a specific type. Try assigning a different type at
" object def method level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public this.Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
def Bar()
this.Fn = "abc"
this.Fn = Foo
@@ -6700,17 +6713,17 @@ func Test_object_variable_complex_type_check()
test_garbagecollect_now()
a.Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" object variable with a specific type. Try assigning a different type at
" script def method level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
- public this.Fn: func(list<dict<number>>): dict<list<number>> = Foo
+ public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
endclass
def Bar()
var a = A.new()
@@ -6720,13 +6733,13 @@ func Test_object_variable_complex_type_check()
test_garbagecollect_now()
Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 2)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 2)
" object variable without any type. Should be set to the initialization
" expression type. Try assigning a different type from script level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6736,13 +6749,13 @@ func Test_object_variable_complex_type_check()
test_garbagecollect_now()
a.Fn = "abc"
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 10)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 10)
" object variable without any type. Should be set to the initialization
" expression type. Try assigning a different type at object def level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6756,13 +6769,13 @@ func Test_object_variable_complex_type_check()
test_garbagecollect_now()
a.Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 1)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 1)
" object variable without any type. Should be set to the initialization
" expression type. Try assigning a different type at script def level.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6776,12 +6789,12 @@ func Test_object_variable_complex_type_check()
test_garbagecollect_now()
Bar()
END
- call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<number>>): dict<list<number>> but got string', 2)
+ call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected
func(list<dict<blob>>): dict<list<blob>> but got string', 2)
" object variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6791,13 +6804,13 @@ func Test_object_variable_complex_type_check()
var a = A.new()
test_garbagecollect_now()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(a.Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn))
a.Fn = "abc"
test_garbagecollect_now()
assert_equal('string', typename(a.Fn))
a.Fn2 = Foo
test_garbagecollect_now()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(a.Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn2))
a.Fn2 = "xyz"
test_garbagecollect_now()
assert_equal('string', typename(a.Fn2))
@@ -6807,7 +6820,7 @@ func Test_object_variable_complex_type_check()
" object variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6815,11 +6828,11 @@ func Test_object_variable_complex_type_check()
public this.Fn2: any
def Bar()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(this.Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>',
typename(this.Fn))
this.Fn = "abc"
assert_equal('string', typename(this.Fn))
this.Fn2 = Foo
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(this.Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>',
typename(this.Fn2))
this.Fn2 = "xyz"
assert_equal('string', typename(this.Fn2))
enddef
@@ -6837,7 +6850,7 @@ func Test_object_variable_complex_type_check()
" object variable with 'any" type. Can be assigned different types.
let lines =<< trim END
vim9script
- def Foo(l: list<dict<number>>): dict<list<number>>
+ def Foo(l: list<dict<blob>>): dict<list<blob>>
return {}
enddef
class A
@@ -6847,11 +6860,11 @@ func Test_object_variable_complex_type_check()
def Bar()
var a = A.new()
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(a.Fn))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn))
a.Fn = "abc"
assert_equal('string', typename(a.Fn))
a.Fn2 = Foo
- assert_equal('func(list<dict<number>>): dict<list<number>>',
typename(a.Fn2))
+ assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn2))
a.Fn2 = "xyz"
assert_equal('string', typename(a.Fn2))
enddef
diff --git a/src/version.c b/src/version.c
index f60f58296..02dd9bfe4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1988,
/**/
1987,
/**/
diff --git a/src/vim9class.c b/src/vim9class.c
index ce2316004..925149e66 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -1152,12 +1152,8 @@ add_lookup_tables(class_T *cl, class_T *extends_cl,
garray_T *objmethods_gap)
* and initialize it.
*/
static void
-add_class_members(class_T *cl, exarg_T *eap)
+add_class_members(class_T *cl, exarg_T *eap, garray_T *type_list_gap)
{
- garray_T type_list;
-
- ga_init2(&type_list, sizeof(type_T *), 10);
-
// Allocate a typval for each class member and initialize it.
cl->class_members_tv = ALLOC_CLEAR_MULT(typval_T,
cl->class_class_member_count);
@@ -1178,8 +1174,9 @@ add_class_members(class_T *cl, exarg_T *eap)
&& etv->v_type != VAR_SPECIAL)
// If the member variable type is not yet set, then use
// the initialization expression type.
- m->ocm_type = typval2type(etv, get_copyID(), &type_list,
- TVTT_DO_MEMBER|TVTT_MORE_SPECIFIC);
+ m->ocm_type = typval2type(etv, get_copyID(),
+ type_list_gap,
+ TVTT_DO_MEMBER|TVTT_MORE_SPECIFIC);
*tv = *etv;
vim_free(etv);
}
@@ -1191,8 +1188,6 @@ add_class_members(class_T *cl, exarg_T *eap)
tv->vval.v_string = NULL;
}
}
-
- clear_type_list(&type_list);
}
/*
@@ -1953,7 +1948,7 @@ early_ret:
// Allocate a typval for each class member and initialize it.
if (is_class && cl->class_class_member_count > 0)
- add_class_members(cl, eap);
+ add_class_members(cl, eap, &type_list);
int have_new = FALSE;
ufunc_T *class_func = NULL;
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qoT6x-009MLH-PO%40256bit.org.
