mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

nasmlib.c: Make nasm_opt_val robust

Browse Source 
nasm_opt_val should be able handle various text stream
passed, including tainted ones. Make it so.

Also it fixes the case when Elf section has multiple
attributes such as "progbits align=16" and friends
(introduced by commit bb0745f). The former just ignore
any other options/values except first one.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2010-04-11 13:00:58 +04:00
parent 6702d93c10
commit 370e5a94c9
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nasmlib.c
View File

@ -726,29 +726,48 @@ char *nasm_get_word(char *p, char **tail)
}
/*
* extract option and value from a string formatted as "opt = val"
* and return pointer to the next string or NULL on empty string
* passed or if nothing left for handling
* Extract "opt=val" values from the stream and
* returns "opt"
*
* Exceptions:
* 1) If "=val" passed the NULL returned though
* you may continue handling the tail via "next"
* 2) If "=" passed the NULL is returned and "val"
* is set to NULL as well
*/
char *nasm_opt_val(char *p, char **opt, char **val)
char *nasm_opt_val(char *p, char **val, char **next)
{
char *q, *next;
char *q, *opt, *nxt;
p = nasm_skip_spaces(p);
if (!p || (p && !*p))
opt = *val = *next = NULL;
p = nasm_get_word(p, &nxt);
if (!p)
return NULL;
q = strchr(p, '=');
if (q) {
*q++ = '\0';
next = nasm_skip_spaces(nasm_skip_word(nasm_skip_spaces(q)));
} else
next = nasm_skip_spaces(nasm_skip_word(nasm_skip_spaces(p)));
if (q == p)
p = NULL;
*q++='\0';
if (*q) {
*val = q;
} else {
q = nasm_get_word(q + 1, &nxt);
if (q)
*val = q;
}
} else {
q = nasm_skip_spaces(nxt);
if (q && *q == '=') {
q = nasm_get_word(q + 1, &nxt);
if (q)
*val = q;
}
}
*opt = nasm_trim_spaces(p);
*val = nasm_trim_spaces(q);
return next;
*next = nxt;
return p;
}
/*