Skip to contentSkip to conversation

qobject: Fix maybe uninitialized in qdict_array_split

PATCH In review Janosch Frank 2 participants 2 messages Jun 15, 2021 – Sep 16, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 qobject: Fix maybe uninitialized in qdict_array_split

Lets make the compiler happy.
Found on gcc version 10.3.0 (Ubuntu 10.3.0-1ubuntu1)

---
 qobject/block-qdict.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
qobject/block-qdict.c +4 -3
index 1487cc5dd8..8d0f00bc3c 100644
@@ -224,7 +224,6 @@ void qdict_array_split(QDict *src, QList **dst)
     for (i = 0; i < UINT_MAX; i++) {
         QObject *subqobj;
         bool is_subqdict;
-        QDict *subqdict;
         char indexstr[32], prefix[32];
         size_t snprintf_ret;
 
@@ -249,14 +248,16 @@ void qdict_array_split(QDict *src, QList **dst)
         }
 
         if (is_subqdict) {
+            QDict *subqdict = NULL;
+
             qdict_extract_subqdict(src, &subqdict, prefix);
             assert(qdict_size(subqdict) > 0);
+            qlist_append_obj(*dst, QOBJECT(subqdict));
         } else {
             qobject_ref(subqobj);
             qdict_del(src, indexstr);
+            qlist_append_obj(*dst, subqobj);
         }
-
-        qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
     }
 }
 
Signature · 1 line
2.30.2
#1 lore raw

Le 15/06/2021 à 15:09, Janosch Frank a écrit :

Quoted 22 lines

Lets make the compiler happy.
Found on gcc version 10.3.0 (Ubuntu 10.3.0-1ubuntu1)

---
 qobject/block-qdict.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
qobject/block-qdict.c +0 -1
index 1487cc5dd8..8d0f00bc3c 100644
@@ -224,7 +224,6 @@ void qdict_array_split(QDict *src, QList **dst)
     for (i = 0; i < UINT_MAX; i++) {
         QObject *subqobj;
         bool is_subqdict;
-        QDict *subqdict;
         char indexstr[32], prefix[32];
         size_t snprintf_ret;
 

qobject/block-qdict.c void qdict_array_split(QDict *src, QList **dst) · line 252

Quoted 5 lines
qobject/block-qdict.c +2 -0
@@ -249,14 +248,16 @@ void qdict_array_split(QDict *src, QList **dst)
         }
 
         if (is_subqdict) {
+            QDict *subqdict = NULL;
+

I think the "= NULL" is not needed with the v2 as the setter (qdict_extract_subqdict()) and the user (qlist_append_obj()) are in the same block now.

Quoted 4 lines
qobject/block-qdict.c +1 -0
             qdict_extract_subqdict(src, &subqdict, prefix);
             assert(qdict_size(subqdict) > 0);
+            qlist_append_obj(*dst, QOBJECT(subqdict));

qobject/block-qdict.c void qdict_array_split(QDict *src, QList **dst) · line 263

Quoted 10 lines
qobject/block-qdict.c +1 -2
         } else {
             qobject_ref(subqobj);
             qdict_del(src, indexstr);
+            qlist_append_obj(*dst, subqobj);
         }
-
-        qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
     }
 }
 

Thanks,
Laurent