AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

scanner: check sanity of version

Browse Source 
scanner does not complain if we put into version attribute
things like -1 1x 1:3 etc.

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Marek Chalupa 2015-07-30 16:42:00 +02:00 committed by Bryce Harrington
parent 765040d1a7
commit bbe6795d9b
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/scanner.c
View File

@ -33,6 +33,7 @@
#include <ctype.h> #include <ctype.h>
#include <expat.h> #include <expat.h>
#include <getopt.h> #include <getopt.h>
#include <limits.h>
#include "wayland-util.h" #include "wayland-util.h"
@ -499,6 +500,29 @@ free_interface(struct interface *interface)
free(interface); free(interface);
} }
/* convert string to unsigned integer,
* in the case of error, return -1 */
static int
strtouint(const char *str)
{
long int ret;
char *end;
int prev_errno = errno;
errno = 0;
ret = strtol(str, &end, 10);
if (errno != 0 || end == str || *end != '\0')
return -1;
/* check range */
if (ret < 0 || ret > INT_MAX) {
return -1;
}
errno = prev_errno;
return (int)ret;
}
static void static void
start_element(void *data, const char *element_name, const char **atts) start_element(void *data, const char *element_name, const char **atts)
{ {
@ -516,7 +540,6 @@ start_element(void *data, const char *element_name, const char **atts)
const char *summary = NULL; const char *summary = NULL;
const char *since = NULL; const char *since = NULL;
const char *allow_null = NULL; const char *allow_null = NULL;
char *end;
int i, version = 0; int i, version = 0;
ctx->loc.line_number = XML_GetCurrentLineNumber(ctx->parser); ctx->loc.line_number = XML_GetCurrentLineNumber(ctx->parser);
@ -524,7 +547,9 @@ start_element(void *data, const char *element_name, const char **atts)
if (strcmp(atts[i], "name") == 0) if (strcmp(atts[i], "name") == 0)
name = atts[i + 1]; name = atts[i + 1];
if (strcmp(atts[i], "version") == 0) if (strcmp(atts[i], "version") == 0)
version = atoi(atts[i + 1]); version = strtouint(atts[i + 1]);
if (version == -1)
fail(&ctx->loc, "wrong version (%s)", atts[i + 1]);
if (strcmp(atts[i], "type") == 0) if (strcmp(atts[i], "type") == 0)
type = atts[i + 1]; type = atts[i + 1];
if (strcmp(atts[i], "value") == 0) if (strcmp(atts[i], "value") == 0)
@ -577,13 +602,9 @@ start_element(void *data, const char *element_name, const char **atts)
message->destructor = 1; message->destructor = 1;
if (since != NULL) { if (since != NULL) {
int prev_errno = errno; version = strtouint(since);
errno = 0; if (version == -1)
version = strtol(since, &end, 0); fail(&ctx->loc, "invalid integer (%s)\n", since);
if (errno != 0 || end == since || *end != '\0')
fail(&ctx->loc,
"invalid integer (%s)\n", since);
errno = prev_errno;
} else { } else {
version = 1; version = 1;
} }