compiler: Define NO_RETURN for MSVC.

[cascardo/ovs.git] / ovsdb / execution.c

diff --git a/ovsdb/execution.c b/ovsdb/execution.c
index 7a1db0c..2be131d 100644 (file)
--- 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,
@@ -659,6 +661,7 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser,
             error = ovsdb_row_from_json(row, rows->u.array.elems[i], x->symtab,
                                         NULL);
             if (error) {
+                ovsdb_row_destroy(row);
                 break;
             }