ovsdb: Fix error leak for negative timeout and invalid until case

Although the check for negative timeout is present, the error string is overwritten if an invalid "until" is found right after. This leaks an error string and results in not reporting the negative timeout back to the user even though it is encountered first. Signed-off-by: Thomas Graf <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
jmiserez · Aug 28, 2014 · 3c5ce2c · 3c5ce2c
1 parent ffd9722
commit 3c5ce2c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ovsdb/execution.c b/ovsdb/execution.c
@@ -643,6 +643,8 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser,
         } else {
             timeout_msec = LLONG_MAX;
         }
+    }
+    if (!error) {
         if (strcmp(json_string(until), "==")
             && strcmp(json_string(until), "!=")) {
             error = ovsdb_syntax_error(until, NULL,