mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-09 23:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Preserve context if out of memory

Browse Source 
If memory allocation fails in json_c_set_serialization_double_format or
json_object_copy_serializer_data then return with an error value and
preserve previous values without overriding them with NULL.
This commit is contained in:
Tobias Stoeckmann
2022-03-20 13:22:46 +01:00
parent 79459b2de2
commit 0c0d901443
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
json_object.c
View File

@@ -933,7 +933,21 @@ int json_c_set_serialization_double_format(const char *double_format, int global
#endif #endif
if (global_serialization_float_format) if (global_serialization_float_format)
free(global_serialization_float_format); free(global_serialization_float_format);
global_serialization_float_format = double_format ? strdup(double_format) : NULL; if (double_format)
{
char *p = strdup(double_format);
if (p == NULL)
{
_json_c_set_last_err("json_c_set_serialization_double_format: "
"out of memory\n");
return -1;
}
global_serialization_float_format = p;
}
else
{
global_serialization_float_format = NULL;
}
} }
else if (global_or_thread == JSON_C_OPTION_THREAD) else if (global_or_thread == JSON_C_OPTION_THREAD)
{ {
@@ -943,9 +957,23 @@ int json_c_set_serialization_double_format(const char *double_format, int global
free(tls_serialization_float_format); free(tls_serialization_float_format);
tls_serialization_float_format = NULL; tls_serialization_float_format = NULL;
} }
tls_serialization_float_format = double_format ? strdup(double_format) : NULL; if (double_format)
{
char *p = strdup(double_format);
if (p == NULL)
{
_json_c_set_last_err("json_c_set_serialization_double_format: "
"out of memory\n");
return -1;
}
tls_serialization_float_format = p;
}
else
{
tls_serialization_float_format = NULL;
}
#else #else
_json_c_set_last_err("json_c_set_set_serialization_double_format: not compiled " _json_c_set_last_err("json_c_set_serialization_double_format: not compiled "
"with __thread support\n"); "with __thread support\n");
return -1; return -1;
#endif #endif
@@ -1590,15 +1618,22 @@ static int json_object_copy_serializer_data(struct json_object *src, struct json
if (dst->_to_json_string == json_object_userdata_to_json_string || if (dst->_to_json_string == json_object_userdata_to_json_string ||
dst->_to_json_string == _json_object_userdata_to_json_string) dst->_to_json_string == _json_object_userdata_to_json_string)
{ {
char *p;
assert(src->_userdata); assert(src->_userdata);
dst->_userdata = strdup(src->_userdata); p = strdup(src->_userdata);
if (p == NULL)
{
_json_c_set_last_err("json_object_copy_serializer_data: out of memory\n");
return -1;
}
dst->_userdata = p;
} }
// else if ... other supported serializers ... // else if ... other supported serializers ...
else else
{ {
_json_c_set_last_err( _json_c_set_last_err(
"json_object_deep_copy: unable to copy unknown serializer data: %p\n", "json_object_copy_serializer_data: unable to copy unknown serializer data: "
(void *)dst->_to_json_string); "%p\n", (void *)dst->_to_json_string);
return -1; return -1;
} }
dst->_user_delete = src->_user_delete; dst->_user_delete = src->_user_delete;