0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00

libobs: Fix obs_data crash

Accessing objects inside obs_datas after obs_data_clear was called on the
parent obs_data causes a NULL dereference.

Reproduce with:
	obs_data_t *data = obs_data_create();
	obs_data_set_obj(data, "foo", NULL);
	obs_data_clear(data);
	obs_data_get_obj(data, "foo");
This commit is contained in:
Palana 2015-08-18 20:00:10 +02:00
parent ddfe6483b3
commit ad5aec99ff

View File

@ -131,7 +131,11 @@ static inline obs_data_t *get_item_obj(struct obs_data_item *item)
if (!item) if (!item)
return NULL; return NULL;
return *(obs_data_t**)get_item_data(item); obs_data_t **data = get_item_data(item);
if (!data)
return NULL;
return *data;
} }
static inline obs_data_t *get_item_default_obj(struct obs_data_item *item) static inline obs_data_t *get_item_default_obj(struct obs_data_item *item)