Fix memory leaks in error paths.

Found by Fortify.

Signed-off-by: yinpeijun <yinpeijun@huawei.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/nx-match.c b/lib/nx-match.c
index 295eec0..ff77422 100644 (file)
--- a/lib/nx-match.c
+++ b/lib/nx-match.c
@@ -109,6 +109,7 @@ check_mask_consistency(const uint8_t *p, const struct mf_field *mf)
                              "bits wildcarded by the mask.  (Future versions "
                              "of OVS may report this as an OpenFlow error.)",
                              s);
+                free(s);
                 break;
             }
         }

diff --git a/ovsdb/execution.c b/ovsdb/execution.c
index 7a1db0c..6314757 100644 (file)
--- a/ovsdb/execution.c
+++ b/ovsdb/execution.c
@@ -659,6 +659,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;
             }