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

libpkgconf: dependency: fix out of boundary write #194

Closed
stoeckmann wants to merge 1 commits from dependency into master
pull from: dependency
merge into: ariadne:master
Conversation 3 Commits 1 Files Changed 1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpkgconf/dependency.c
View File

@ -237,6 +237,7 @@ pkgconf_dependency_parse_str(const pkgconf_client_t *client, pkgconf_list_t *dep
char *vstart = NULL; char *vstart = NULL;
char *package = NULL, *version = NULL; char *package = NULL, *version = NULL;
char *cnameptr = cmpname; char *cnameptr = cmpname;
char *cnameend = cmpname + PKGCONF_ITEM_SIZE - 1;
memset(cmpname, '\0', sizeof cmpname); memset(cmpname, '\0', sizeof cmpname);
@ -304,7 +305,8 @@ pkgconf_dependency_parse_str(const pkgconf_client_t *client, pkgconf_list_t *dep
if (PKGCONF_IS_OPERATOR_CHAR(*ptr)) if (PKGCONF_IS_OPERATOR_CHAR(*ptr))
{ {
state = INSIDE_OPERATOR; state = INSIDE_OPERATOR;
*cnameptr++ = *ptr; if (cnameptr < cnameend)
*cnameptr++ = *ptr;
} }
break; break;
@ -315,7 +317,7 @@ pkgconf_dependency_parse_str(const pkgconf_client_t *client, pkgconf_list_t *dep
state = AFTER_OPERATOR; state = AFTER_OPERATOR;
compare = pkgconf_pkg_comparator_lookup_by_name(cmpname); compare = pkgconf_pkg_comparator_lookup_by_name(cmpname);
} }
else else if (cnameptr < cnameend)
*cnameptr++ = *ptr; *cnameptr++ = *ptr;
break; break;