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

libpkgconf: fragment: revert the quoting changes, but not the lexing changes 

a few strange edge cases are causing problems (closes #168)
pull/173/head
William Pitcock 2018-01-22 15:13:14 -06:00
parent d1618ece3a
commit d5fd74d799
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libpkgconf/fragment.c
View File

@ -386,15 +386,19 @@ pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pk
} }
} }
static inline bool static inline char *
fragment_should_quote(const pkgconf_fragment_t *frag) fragment_quote(const pkgconf_fragment_t *frag)
{ {
const char *src; const char *src = frag->data;
ssize_t outlen = strlen(src) + 10;
char *out, *dst;
if (frag->data == NULL) if (frag->data == NULL)
return false; return NULL;
for (src = frag->data; *src; src++) out = dst = calloc(outlen, 1);
for (; *src; src++)
{ {
if (((*src < ' ') || if (((*src < ' ') ||
(*src >= (' ' + (frag->merged ? 1 : 0)) && *src < '$') || (*src >= (' ' + (frag->merged ? 1 : 0)) && *src < '$') ||
@ -406,10 +410,19 @@ fragment_should_quote(const pkgconf_fragment_t *frag)
(*src == '`') || (*src == '`') ||
(*src > 'z' && *src < '~') || (*src > 'z' && *src < '~') ||
(*src > '~'))) (*src > '~')))
return true; *dst++ = '\\';
*dst++ = *src;
if ((ptrdiff_t)(dst - out) + 2 > outlen)
{
outlen *= 2;
out = realloc(out, outlen);
}
} }
return false; *dst = 0;
return out;
} }
static inline size_t static inline size_t
@ -422,10 +435,9 @@ pkgconf_fragment_len(const pkgconf_fragment_t *frag)
if (frag->data != NULL) if (frag->data != NULL)
{ {
len += strlen(frag->data); char *quoted = fragment_quote(frag);
len += strlen(quoted);
if (fragment_should_quote(frag)) free(quoted);
len += 2;
} }
return len; return len;
@ -462,13 +474,13 @@ fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool e
{ {
const pkgconf_fragment_t *frag = node->data; const pkgconf_fragment_t *frag = node->data;
size_t buf_remaining = buflen - (bptr - buf); size_t buf_remaining = buflen - (bptr - buf);
bool should_quote = fragment_should_quote(frag); char *quoted = fragment_quote(frag);
if (pkgconf_fragment_len(frag) > buf_remaining) if (strlen(quoted) > buf_remaining)
{
free(quoted);
break; break;
}
if (should_quote)
*bptr++ = '\'';
if (frag->type) if (frag->type)
{ {
@ -476,11 +488,11 @@ fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool e
*bptr++ = frag->type; *bptr++ = frag->type;
} }
if (frag->data) if (quoted != NULL)
bptr += pkgconf_strlcpy(bptr, frag->data, buf_remaining); {
bptr += pkgconf_strlcpy(bptr, quoted, buf_remaining);
if (should_quote) free(quoted);
*bptr++ = '\''; }
*bptr++ = ' '; *bptr++ = ' ';
} }