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

libpkgconf: tuple: fix out of boundary write #197

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

4
libpkgconf/tuple.c
View File

@ -264,6 +264,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
else if (*(ptr + 1) == '{') else if (*(ptr + 1) == '{')
{ {
char varname[PKGCONF_ITEM_SIZE]; char varname[PKGCONF_ITEM_SIZE];
char *vend = varname + PKGCONF_ITEM_SIZE - 1;
char *vptr = varname; char *vptr = varname;
const char *pptr; const char *pptr;
char *kv, *parsekv; char *kv, *parsekv;
@ -273,7 +274,8 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
for (pptr = ptr + 2; *pptr != '\0'; pptr++) for (pptr = ptr + 2; *pptr != '\0'; pptr++)
{ {
if (*pptr != '}') if (*pptr != '}')
*vptr++ = *pptr; if (vptr < vend)
*vptr++ = *pptr;
else else
{ {
*vptr = '\0'; *vptr = '\0';