From 1f8d0d30e1e49889c98cfd6dfb831d1eae914937 Mon Sep 17 00:00:00 2001 From: Syam Sidhardhan Date: Tue, 8 Jan 2013 17:07:45 +0530 Subject: [PATCH] health: Fix pointer to local variable out-of-scope The address of the local variable is used outside the scope. --- profiles/health/hdp_util.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c index 5f8180678..ed987e39e 100644 --- a/profiles/health/hdp_util.c +++ b/profiles/health/hdp_util.c @@ -153,13 +153,12 @@ static gboolean parse_data_type(DBusMessageIter *iter, gpointer data, { struct hdp_application *app = data; DBusMessageIter *value; + DBusMessageIter variant; int ctype; ctype = dbus_message_iter_get_arg_type(iter); value = iter; if (ctype == DBUS_TYPE_VARIANT) { - DBusMessageIter variant; - /* Get value inside the variable */ dbus_message_iter_recurse(iter, &variant); ctype = dbus_message_iter_get_arg_type(&variant); @@ -181,13 +180,12 @@ static gboolean parse_role(DBusMessageIter *iter, gpointer data, GError **err) { struct hdp_application *app = data; DBusMessageIter *string; + DBusMessageIter value; int ctype; const char *role; ctype = dbus_message_iter_get_arg_type(iter); if (ctype == DBUS_TYPE_VARIANT) { - DBusMessageIter value; - /* Get value inside the variable */ dbus_message_iter_recurse(iter, &value); ctype = dbus_message_iter_get_arg_type(&value); @@ -222,13 +220,12 @@ static gboolean parse_desc(DBusMessageIter *iter, gpointer data, GError **err) { struct hdp_application *app = data; DBusMessageIter *string; + DBusMessageIter variant; int ctype; const char *desc; ctype = dbus_message_iter_get_arg_type(iter); if (ctype == DBUS_TYPE_VARIANT) { - DBusMessageIter variant; - /* Get value inside the variable */ dbus_message_iter_recurse(iter, &variant); ctype = dbus_message_iter_get_arg_type(&variant); @@ -253,14 +250,13 @@ static gboolean parse_chan_type(DBusMessageIter *iter, gpointer data, { struct hdp_application *app = data; DBusMessageIter *value; + DBusMessageIter variant; char *chan_type; int ctype; ctype = dbus_message_iter_get_arg_type(iter); value = iter; if (ctype == DBUS_TYPE_VARIANT) { - DBusMessageIter variant; - /* Get value inside the variable */ dbus_message_iter_recurse(iter, &variant); ctype = dbus_message_iter_get_arg_type(&variant); -- 2.47.3