summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorljsachs <larry.j.sachs@intel.com>2016-10-11 16:05:00 -0700
committerGitHub <noreply@github.com>2016-10-11 16:05:00 -0700
commitadc2b74259d78b6c6dcda4113d172e6947bd9e99 (patch)
tree263d1b8de5d1ab819eceb2196814c53c72af6120
parente2373105255a854af8bbf4b08f2327405d307ae7 (diff)
downloaddleyna-server-ljsachs-patch-2.tar.gz
fix for issues #154 and #155ljsachs-patch-2
-rw-r--r--libdleyna/server/device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libdleyna/server/device.c b/libdleyna/server/device.c
index 27748a0..90d1384 100644
--- a/libdleyna/server/device.c
+++ b/libdleyna/server/device.c
@@ -1866,7 +1866,7 @@ static gboolean prv_child_count_for_list_cb(dls_async_task_t *cb_data,
static void prv_retrieve_child_count_for_list(dls_async_task_t *cb_data)
{
dls_async_bas_t *cb_task_data = &cb_data->ut.bas;
- dls_device_object_builder_t *builder;
+ dls_device_object_builder_t *builder = NULL;
guint i;
for (i = cb_task_data->retrieved; i < cb_task_data->vbs->len; ++i) {
@@ -1878,7 +1878,7 @@ static void prv_retrieve_child_count_for_list(dls_async_task_t *cb_data)
cb_task_data->retrieved = i;
- if (i < cb_task_data->vbs->len)
+ if (i < cb_task_data->vbs->len && builder)
prv_get_child_count(cb_data, prv_child_count_for_list_cb,
builder->id);
else
@@ -5897,7 +5897,7 @@ static uint8_t *prv_hex_str_to_bin(const gchar *hex_str, gsize *out_len)
gsize i;
gsize j;
uint8_t *buffer = NULL;
- uint8_t byte;
+ uint8_t byte = 0;
gsize len;
len = strlen(hex_str);