opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-28 17:42:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Properly handle NULL data in json

Browse Source
This commit is contained in:
Penwywern
2026-02-04 02:04:28 +01:00
committed by Ryan Foster
parent 82b1112389
commit a4f3c16065
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-data.c
+10
View File
@@ -483,6 +483,11 @@ static void obs_data_add_json_array(obs_data_t *data, const char *key, json_t *j
obs_data_array_release(array);
}
static inline void obs_data_add_json_null(obs_data_t *data, const char *key)
{
obs_data_set_obj(data, key, NULL);
}
static void obs_data_add_json_item(obs_data_t *data, const char *key, json_t *json)
{
if (json_is_object(json))
@@ -499,6 +504,8 @@ static void obs_data_add_json_item(obs_data_t *data, const char *key, json_t *js
obs_data_set_bool(data, key, true);
else if (json_is_false(json))
obs_data_set_bool(data, key, false);
else if (json_is_null(json))
obs_data_add_json_null(data, key);
}
/* ------------------------------------------------------------------------- */
@@ -556,6 +563,9 @@ static inline void set_json_array(json_t *json, const char *name, obs_data_item_
static json_t *obs_data_to_json(obs_data_t *data, bool with_defaults)
{
if (!data)
return json_null();
json_t *json = json_object();
obs_data_item_t *item = NULL;