]> xenbits.xensource.com Git - libvirt.git/commitdiff
cpu_x86: Handle error in x86DataToCPU when calling x86DataAdd
authorJohn Ferlan <jferlan@redhat.com>
Fri, 21 Jun 2019 17:10:35 +0000 (13:10 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 24 Jun 2019 21:46:49 +0000 (17:46 -0400)
Commit 9c9620af called x86DataAdd without checking for an error,
so add the error checking.

Found by Coverity

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/cpu/cpu_x86.c

index 978a60c90a6fdf5a87f5db3d394041c04905f445..55b55da784036c32d4438a76c7bdc93da645a043 100644 (file)
@@ -822,7 +822,8 @@ x86DataToCPU(const virCPUx86Data *data,
         for (blocker = hvModel->blockers; *blocker; blocker++) {
             if ((feature = x86FeatureFind(map, *blocker)) &&
                 !x86DataIsSubset(&copy, &feature->data))
-                x86DataAdd(&modelData, &feature->data);
+                if (x86DataAdd(&modelData, &feature->data) < 0)
+                    goto error;
         }
     }