norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tsm: unicode: fix error-path in tsm_symbol_append()

Browse Source 
We never checked the memory helpers for errors because they used to be
from glib. However, with our own helpers we need to check for errors to be
sure.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-09-18 12:17:41 +02:00
parent 0273802809
commit c15604b6b7
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tsm_unicode.c
View File

@ -298,10 +298,28 @@ tsm_symbol_t tsm_symbol_append(struct tsm_symbol_table *tbl,
return sym;
memcpy(nval, buf, s * sizeof(uint32_t));
nsym = tbl->next_id++;
shl_hashtable_insert(tbl->symbols, nval, (void*)(long)nsym);
shl_array_push(tbl->index, &nval);
nsym = tbl->next_id + 1;
/* Out of IDs; we actually have 2 Billion IDs so this seems
* very unlikely but lets be safe here */
if (nsym <= tbl->next_id++)
goto err_id;
ret = shl_hashtable_insert(tbl->symbols, nval, (void*)(long)nsym);
if (ret)
goto err_id;
ret = shl_array_push(tbl->index, &nval);
if (ret)
goto err_symbol;
return nsym;
err_symbol:
shl_hashtable_remove(tbl->symbols, nval);
err_id:
--tbl->next_id;
free(nval);
return sym;
}
const char *tsm_symbol_get_u8(struct tsm_symbol_table *tbl,