mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

properties: make safer serialize_dict implementation

Browse source 
Don't use alloca for the serialized string but instead write the
serialized string directly to the file.

Fixes #1249
This commit is contained in:
Wim Taymans 2021-06-01 10:35:45 +02:00
parent 1cb613ee4b
commit e994949d57
1 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/pipewire/properties.c
View file

@ -542,6 +542,44 @@ const char *pw_properties_iterate(const struct pw_properties *properties, void *
return pw_array_get_unchecked(&impl->items, index, struct spa_dict_item)->key;
}
static int encode_string(FILE *f, const char *val)
{
int len = 0;
len += fprintf(f, "\"");
while (*val) {
switch (*val) {
case '\n':
len += fprintf(f, "\\n");
break;
case '\r':
len += fprintf(f, "\\r");
break;
case '\b':
len += fprintf(f, "\\b");
break;
case '\t':
len += fprintf(f, "\\t");
break;
case '\f':
len += fprintf(f, "\\f");
break;
case '\\':
case '"':
len += fprintf(f, "\\%c", *val);
break;
default:
if (*val > 0 && *val < 0x20)
len += fprintf(f, "\\u%04x", *val);
else
len += fprintf(f, "%c", *val);
break;
}
val++;
}
len += fprintf(f, "\"");
return len-1;
}
SPA_EXPORT
int pw_properties_serialize_dict(FILE *f, const struct spa_dict *dict, uint32_t flags)
{
@ -558,10 +596,7 @@ int pw_properties_serialize_dict(FILE *f, const struct spa_dict *dict, uint32_t
spa_json_is_container(it->value, len)) {
fprintf(f, "%s", it->value);
} else {
size_t size = (len+1) * 4;
char str[size];
spa_json_encode_string(str, size, it->value);
fprintf(f, "%s", str);
encode_string(f, it->value);
}
count++;
}