From: Ben Pfaff <blp@nicira.com>
Date: Wed, 26 Dec 2012 17:43:51 +0000 (-0800)
Subject: ovsdb-server: Fix memory leak when manager table has no status column.
X-Git-Tag: sliver-openvswitch-1.9.90-3~10^2~29
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bfe834eb8e712ac195c5b31839556a3a00f2b228;p=sliver-openvswitch.git

ovsdb-server: Fix memory leak when manager table has no status column.

This is a corner case.  I doubt that it's triggered in practice outside the
unit tests.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 69548c202..6032d7320 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -523,6 +523,10 @@ write_string_string_column(struct ovsdb_row *row, const char *column_name,
     datum = get_datum(row, column_name, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING,
                       UINT_MAX);
     if (!datum) {
+        for (i = 0; i < n; i++) {
+            free(keys[i]);
+            free(values[i]);
+        }
         return;
     }