osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use strtoul() rather than sscanf to parse octal and hex numbers in 

escape sequences; sscanf is a bit heavyweight, and using strtoul() also
squelches some "return value ignored" warnings.

svn path=/trunk/; revision=37007
This commit is contained in:
Guy Harris 2011-05-06 03:59:44 +00:00
parent bb9f347294
commit 02d50e354b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dfilter/scanner.l
View File

@ -215,8 +215,8 @@ static void mark_lval_deprecated(const char *s);
<DQUOTE>\\[0-7]{1,3} {
/* octal sequence */
unsigned int result;
sscanf(yytext + 1, "%o", &result);
unsigned long result;
result = strtoul(yytext + 1, NULL, 8);
if (result > 0xff) {
g_string_free(quoted_string, TRUE);
quoted_string = NULL;
@ -228,8 +228,8 @@ static void mark_lval_deprecated(const char *s);
<DQUOTE>\\x[[:xdigit:]]{1,2} {
/* hex sequence */
unsigned int result;
sscanf(yytext + 2, "%x", &result);
unsigned long result;
result = strtoul(yytext + 2, NULL, 16);
g_string_append_c(quoted_string, (gchar) result);
}