From 58265e695018ab5ad1dcb327c0ac4662c1909b54 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 9 Jul 2016 08:14:42 -0700 Subject: [PATCH] libobs: Fix null pointer dereference How this was replicated: - Create new VLC video source - Add video in its properties - Press cancel on the properties dialog to reset the settings --- libobs/obs-data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libobs/obs-data.c b/libobs/obs-data.c index 786a90e86..5f94b3264 100644 --- a/libobs/obs-data.c +++ b/libobs/obs-data.c @@ -156,10 +156,13 @@ static inline obs_data_t *get_item_autoselect_obj(struct obs_data_item *item) static inline obs_data_array_t *get_item_array(struct obs_data_item *item) { + obs_data_array_t **array; + if (!item) return NULL; - return *(obs_data_array_t**)get_item_data(item); + array = (obs_data_array_t**)get_item_data(item); + return array ? *array : NULL; } static inline obs_data_array_t *get_item_default_array(