quinn-os/my-basic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fixed a memory leak when reassigning an array element with string.

Browse Source
This commit is contained in:
Wang Renxin 2019-03-16 15:26:11 +08:00
parent 3630e237f5
commit d89d018823
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,3 +1,6 @@
Mar. 16 2019
Fixed a memory leak when reassigning an array element with string, thanks to Jacques Diederik for pointing it out
Feb. 2 2019 Feb. 2 2019
Fixed some crash and hanging with invalid expression and routine, thanks to siraben for pointing it out Fixed some crash and hanging with invalid expression and routine, thanks to siraben for pointing it out

4
core/my_basic.c
View File

@ -7373,6 +7373,8 @@ static int _set_array_elem(mb_interpreter_t* s, _ls_node_t* ast, _array_t* arr,
_handle_error_on_obj(s, SE_RN_STRING_EXPECTED, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_STRING_EXPECTED, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
_sl = strlen(val->string); _sl = strlen(val->string);
if(*((char**)rawptr))
mb_free(*((char**)rawptr));
*((char**)rawptr) = (char*)mb_malloc(_sl + 1); *((char**)rawptr) = (char*)mb_malloc(_sl + 1);
memcpy(*((char**)rawptr), val->string, _sl + 1); memcpy(*((char**)rawptr), val->string, _sl + 1);
} }
@ -7384,6 +7386,8 @@ static int _set_array_elem(mb_interpreter_t* s, _ls_node_t* ast, _array_t* arr,
break; break;
} }
#else /* MB_SIMPLE_ARRAY */ #else /* MB_SIMPLE_ARRAY */
if(arr->types[index] == _DT_STRING && *((char**)rawptr))
mb_free(*((char**)rawptr));
switch(*type) { switch(*type) {
case _DT_STRING: { case _DT_STRING: {
size_t _sl = 0; size_t _sl = 0;