dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eolian: do not use an invalid pointer after updating buffer 

Replacing decimal point in buffer resulted in invalidation of the original
string pointer. On Linux, this issue was for some reason not caught, but
it was wrong anyway. Use the updated string correctly now.

@fix
This commit is contained in:
Daniel Kolesa 2015-07-15 15:32:53 +01:00
parent 573058c009
commit 099bdd7819
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/eolian/eo_lexer.c
View File

@ -621,19 +621,19 @@ write_val_with_decpoint(Eo_Lexer *ls, Eo_Token *tok, int type)
static void
write_val(Eo_Lexer *ls, Eo_Token *tok, Eina_Bool is_float)
{
const char *str = eina_strbuf_string_get(ls->buff);
int type = get_type(ls, is_float);
char *end = NULL;
if (is_float)
{
replace_decpoint(ls, '.');
if (type == NUM_FLOAT)
tok->value.f = strtof(str, &end);
tok->value.f = strtof(eina_strbuf_string_get(ls->buff), &end);
else if (type == NUM_DOUBLE)
tok->value.d = strtod(str, &end);
tok->value.d = strtod(eina_strbuf_string_get(ls->buff), &end);
}
else
{
const char *str = eina_strbuf_string_get(ls->buff);
/* signed is always in the same memory location */
if (type == NUM_INT || type == NUM_UINT)
tok->value.u = strtoul(str, &end, 0);