NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: json: Don't copy string in virJSONValueNewString

Browse Source 
With 'g_strdup' not needing error handling we can ask callers to pass a
copy of the string which will be adopted by the JSON value.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
This commit is contained in:
Peter Krempa 2021-12-20 14:52:13 +01:00
parent f668e17bea
commit a8b4a41731
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/virjson.c
View File

@ -412,7 +412,7 @@ virJSONValueHashFree(void *opaque)
virJSONValue * virJSONValue *
virJSONValueNewString(const char *data) virJSONValueNewString(char *data)
{ {
virJSONValue *val; virJSONValue *val;
@ -422,7 +422,7 @@ virJSONValueNewString(const char *data)
val = g_new0(virJSONValue, 1); val = g_new0(virJSONValue, 1);
val->type = VIR_JSON_TYPE_STRING; val->type = VIR_JSON_TYPE_STRING;
val->data.string = g_strdup(data); val->data.string = data;
return val; return val;
} }
@ -608,12 +608,9 @@ virJSONValueObjectInsertString(virJSONValue *object,
const char *value, const char *value,
bool prepend) bool prepend)
{ {
virJSONValue *jvalue = virJSONValueNewString(value); g_autoptr(virJSONValue) jvalue = virJSONValueNewString(g_strdup(value));
if (!jvalue)
return -1; return virJSONValueObjectInsert(object, key, &jvalue, prepend);
if (virJSONValueObjectInsert(object, key, &jvalue, prepend) < 0)
return -1;
return 0;
} }
@ -775,7 +772,7 @@ int
virJSONValueArrayAppendString(virJSONValue *object, virJSONValueArrayAppendString(virJSONValue *object,
const char *value) const char *value)
{ {
g_autoptr(virJSONValue) jvalue = virJSONValueNewString(value); g_autoptr(virJSONValue) jvalue = virJSONValueNewString(g_strdup(value));
if (virJSONValueArrayAppend(object, &jvalue) < 0) if (virJSONValueArrayAppend(object, &jvalue) < 0)
return -1; return -1;
@ -1438,7 +1435,7 @@ virJSONValueCopy(const virJSONValue *in)
/* No need to error out in the following cases */ /* No need to error out in the following cases */
case VIR_JSON_TYPE_STRING: case VIR_JSON_TYPE_STRING:
out = virJSONValueNewString(in->data.string); out = virJSONValueNewString(g_strdup(in->data.string));
break; break;
case VIR_JSON_TYPE_NUMBER: case VIR_JSON_TYPE_NUMBER:
out = virJSONValueNewNumber(g_strdup(in->data.number)); out = virJSONValueNewNumber(g_strdup(in->data.number));

2
src/util/virjson.h
View File

@ -50,7 +50,7 @@ int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
virJSONValue *virJSONValueNewString(const char *data); virJSONValue *virJSONValueNewString(char *data);
virJSONValue *virJSONValueNewStringLen(const char *data, size_t length); virJSONValue *virJSONValueNewStringLen(const char *data, size_t length);
virJSONValue *virJSONValueNewNumberInt(int data); virJSONValue *virJSONValueNewNumberInt(int data);
virJSONValue *virJSONValueNewNumberUint(unsigned int data); virJSONValue *virJSONValueNewNumberUint(unsigned int data);

4
tests/virjsontest.c
View File

@ -441,8 +441,8 @@ testJSONObjectFormatSteal(const void *opaque G_GNUC_UNUSED)
g_autoptr(virJSONValue) t1 = NULL; g_autoptr(virJSONValue) t1 = NULL;
g_autoptr(virJSONValue) t2 = NULL; g_autoptr(virJSONValue) t2 = NULL;
if (!(a1 = virJSONValueNewString("test")) || if (!(a1 = virJSONValueNewString(g_strdup("test"))) ||
!(a2 = virJSONValueNewString("test"))) { !(a2 = virJSONValueNewString(g_strdup("test")))) {
VIR_TEST_VERBOSE("Failed to create json object"); VIR_TEST_VERBOSE("Failed to create json object");
} }