From: Ben Pfaff <blp@nicira.com>
Date: Fri, 27 Jan 2012 20:37:45 +0000 (-0800)
Subject: table: Avoid segmentation fault when printing an empty cell in JSON format.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=05e547e7ee479fa2c3ca5bc9d2eb57bc8a07bdb8;p=sliver-openvswitch.git

table: Avoid segmentation fault when printing an empty cell in JSON format.

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

diff --git a/lib/table.c b/lib/table.c
index ff11e7816..537fae97c 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -480,8 +480,10 @@ table_print_json__(const struct table *table, const struct table_style *style)
             const struct cell *cell = table_cell__(table, y, x);
             if (cell->text) {
                 json_array_add(row, json_string_create(cell->text));
-            } else {
+            } else if (cell->json) {
                 json_array_add(row, json_clone(cell->json));
+            } else {
+                json_array_add(row, json_null_create());
             }
         }
         json_array_add(data, row);