ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

parse: fix parser resiliency

pull/1/merge
William Pitcock 2011-07-25 01:02:53 -05:00
parent 85bb0441d4
commit 714bcaaac7
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
parse.c
View File

@ -141,6 +141,7 @@ pkg_dependency_add(pkg_dependency_t *head, const char *package, const char *vers
return dep; return dep;
} }
#define DEBUG_PARSE 0
#define MODULE_SEPARATOR(c) ((c) == ',' || isspace ((c))) #define MODULE_SEPARATOR(c) ((c) == ',' || isspace ((c)))
#define OPERATOR_CHAR(c) ((c) == '<' || (c) == '>' || (c) == '!' || (c) == '=') #define OPERATOR_CHAR(c) ((c) == '<' || (c) == '>' || (c) == '!' || (c) == '=')
@ -186,6 +187,11 @@ parse_deplist(pkg_t *pkg, const char *depends)
} }
else if (MODULE_SEPARATOR(*ptr)) else if (MODULE_SEPARATOR(*ptr))
state = OUTSIDE_MODULE; state = OUTSIDE_MODULE;
else if (*(ptr + 1) == '\0')
{
ptr++;
state = OUTSIDE_MODULE;
}
if (state != INSIDE_MODULE_NAME && start != ptr) if (state != INSIDE_MODULE_NAME && start != ptr)
{ {
@ -195,7 +201,9 @@ parse_deplist(pkg_t *pkg, const char *depends)
iter++; iter++;
package = strndup(iter, ptr - iter); package = strndup(iter, ptr - iter);
// fprintf(stderr, "Found package: %s\n", package); #if DEBUG_PARSE
fprintf(stderr, "Found package: %s\n", package);
#endif
start = ptr; start = ptr;
} }
@ -216,11 +224,13 @@ parse_deplist(pkg_t *pkg, const char *depends)
case BEFORE_OPERATOR: case BEFORE_OPERATOR:
if (OPERATOR_CHAR(*ptr)) if (OPERATOR_CHAR(*ptr))
state = INSIDE_OPERATOR; state = INSIDE_OPERATOR;
break; break;
case INSIDE_OPERATOR: case INSIDE_OPERATOR:
if (!OPERATOR_CHAR(*ptr)) if (!OPERATOR_CHAR(*ptr))
state = AFTER_OPERATOR; state = AFTER_OPERATOR;
break; break;
case AFTER_OPERATOR: case AFTER_OPERATOR:
@ -232,12 +242,14 @@ parse_deplist(pkg_t *pkg, const char *depends)
break; break;
case INSIDE_VERSION: case INSIDE_VERSION:
if (MODULE_SEPARATOR(*ptr)) if (MODULE_SEPARATOR(*ptr) || *(ptr + 1) == '\0')
{ {
version = strndup(vstart, ptr - vstart); version = strndup(vstart, ptr - vstart);
state = OUTSIDE_MODULE; state = OUTSIDE_MODULE;
// fprintf(stderr, "Found version: %s\n", version); #if DEBUG_PARSE
fprintf(stderr, "Found version: %s\n", version);
#endif
deplist = pkg_dependency_add(deplist, package, version, PKG_ANY); deplist = pkg_dependency_add(deplist, package, version, PKG_ANY);
if (deplist_head == NULL) if (deplist_head == NULL)