]> xenbits.xensource.com Git - libvirt.git/commitdiff
log: Fix reporting OOM error incorrectly when defining a logging filter
authorNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Mon, 12 Sep 2016 10:56:29 +0000 (13:56 +0300)
committerErik Skultety <eskultet@redhat.com>
Mon, 12 Sep 2016 13:59:35 +0000 (15:59 +0200)
When a new filter is being defined, the return code is not handled properly,
thus triggering OOM error reporting routine (bug introduced by 51b2606f).

Signed-off-by: Erik Skultety <eskultet@redhat.com>
src/util/virlog.c

index 06f9a602e10f6417b26a7383df50ff655f03ed7e..f5b88b68f7b4107f1894650c17e6bac813b6ab44 100644 (file)
@@ -335,11 +335,12 @@ virLogDefineFilter(const char *match,
         goto cleanup;
 
     virLogFiltersSerial++;
+    ret = virLogNbFilters - 1;
  cleanup:
     virLogUnlock();
     if (ret < 0)
         virReportOOMError();
-    return virLogNbFilters;
+    return ret;
 }
 
 /**