Merge branch 'escl-fix-alloc' into 'master'

escl: fix char_to_array memory allocation calculations

Closes #425

See merge request sane-project/backends!571
escl-fix-sleep-mode
Ordissimo 2021-01-15 15:16:45 +00:00
commit c26e9acd79
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -90,9 +90,9 @@ char_to_array(SANE_String_Const *tab, int *tabsize, SANE_String_Const mode, int
}
(*tabsize)++;
if (*tabsize == 1)
board = (SANE_String_Const *)malloc(sizeof(SANE_String_Const) * (*tabsize) + 1);
board = (SANE_String_Const *)malloc(sizeof(SANE_String_Const) * ((*tabsize) + 1));
else
board = (SANE_String_Const *)realloc(tab, sizeof(SANE_String_Const) * (*tabsize) + 1);
board = (SANE_String_Const *)realloc(tab, sizeof(SANE_String_Const) * ((*tabsize) + 1));
board[*tabsize - 1] = (SANE_String_Const)strdup(convert);
board[*tabsize] = NULL;
return (board);