qemu: monitor: Sanitize control flow in qemuMonitorSetCapabilities

0e9fadd6 · Peter Krempa · 119aa5d3 · 0e9fadd6
隐藏空白更改
内联并排

Showing with 3 addition and 10 deletion

src/qemu/qemu_monitor.c src/qemu/qemu_monitor.c +3 -10

未找到文件。
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1527,7 +1527,6 @@ qemuMonitorEmitSerialChange(qemuMonitorPtr mon,
 int
 qemuMonitorSetCapabilities(qemuMonitorPtr mon)
 {
-    int ret;
    VIR_DEBUG("mon=%p", mon);
    if (!mon) {
@@ -1536,16 +1535,10 @@ qemuMonitorSetCapabilities(qemuMonitorPtr mon)
        return -1;
    }
-    if (mon->json) {
+    if (!mon->json)
-        ret = qemuMonitorJSONSetCapabilities(mon);
+        return 0;
-        if (ret < 0)
-            goto cleanup;
-    } else {
-        ret = 0;
-    }
- cleanup:
+    return qemuMonitorJSONSetCapabilities(mon);
-    return ret;
 }