walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Memory fixes (#1705) 

* fix: free-before-init in renwin_init_surface when using sdl renderer

`ren->rensurface.surface` presupposes zero-initialized rensurface.
Rensurface was not actually zero-initialized.
It is now.

* fix: heap buffer overflow in process_env_free

`process_env_free` presupposed that it was null-terminated.
Pass length to free instead.

* use calloc instead of memset for zero-init

Co-authored-by: Guldoman <giulio.lettieri@gmail.com>

---------

Co-authored-by: Guldoman <giulio.lettieri@gmail.com>
This commit is contained in:
Chloé Vulquin 2024-01-20 01:02:46 +01:00 committed by George Sokianos
parent 2755117e2d
commit 3897e59e6b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/process.c
View File

@ -560,12 +560,12 @@ static int process_env_add(process_env_t *env_list, size_t *env_len, const char
} }
static void process_env_free(process_env_t *list) { static void process_env_free(process_env_t *list, size_t list_len) {
if (!*list) return; if (!*list) return;
#ifdef _WIN32 #ifdef _WIN32
free(*list); free(*list);
#else #else
for (size_t i = 0; (*list)[i]; i++) free((*list)[i]); for (size_t i = 0; i < list_len; i++) free((*list)[i]);
free(*list); free(*list);
#endif #endif
*list = NULL; *list = NULL;
@ -830,7 +830,7 @@ static int process_start(lua_State* L) {
} }
} }
process_arglist_free(&arglist); process_arglist_free(&arglist);
process_env_free(&env_vars); process_env_free(&env_vars, env_vars_len);
if (retval == -1) if (retval == -1)
return lua_error(L); return lua_error(L);

2
src/renderer.c
View File

@ -508,7 +508,7 @@ RenWindow* ren_init(SDL_Window *win) {
fprintf(stderr, "internal font error when starting the application\n"); fprintf(stderr, "internal font error when starting the application\n");
return NULL; return NULL;
} }
RenWindow* window_renderer = malloc(sizeof(RenWindow)); RenWindow* window_renderer = calloc(1, sizeof(RenWindow));
window_renderer->window = win; window_renderer->window = win;
renwin_init_surface(window_renderer); renwin_init_surface(window_renderer);