]> xenbits.xensource.com Git - libvirt.git/commitdiff
lxc: Clang is complaining about possible NULL pointer.
authorJulio Faracco <jcfaracco@gmail.com>
Wed, 7 Nov 2018 20:57:02 +0000 (18:57 -0200)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 7 Nov 2018 21:22:16 +0000 (16:22 -0500)
The array "mount" inside lxc_container is not being checked before for
loop. Clang syntax scan is complaining about this segmentation fault.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
src/lxc/lxc_container.c

index 918194dacd55abace2802c4022855de787ece5d3..d834bf01d76cb9ca13b80e712f73e8644eafaa44 100644 (file)
@@ -867,9 +867,13 @@ static int lxcContainerSetReadOnly(void)
         }
     }
 
-    if (mounts)
-        qsort(mounts, nmounts, sizeof(mounts[0]),
-              virStringSortRevCompare);
+    if (!mounts) {
+        ret = 0;
+        goto cleanup;
+    }
+
+    qsort(mounts, nmounts, sizeof(mounts[0]),
+          virStringSortRevCompare);
 
     for (i = 0; i < nmounts; i++) {
         VIR_DEBUG("Bind readonly %s", mounts[i]);
@@ -883,9 +887,7 @@ static int lxcContainerSetReadOnly(void)
 
     ret = 0;
  cleanup:
-    for (i = 0; i < nmounts; i++)
-        VIR_FREE(mounts[i]);
-    VIR_FREE(mounts);
+    virStringListFreeCount(mounts, nmounts);
     endmntent(procmnt);
     return ret;