projects
/
openvswitch
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a4999f
)
table: Avoid segmentation fault when printing an empty cell in JSON format.
author
Ben Pfaff
<blp@nicira.com>
Fri, 27 Jan 2012 20:37:45 +0000
(12:37 -0800)
committer
Ben Pfaff
<blp@nicira.com>
Mon, 30 Jan 2012 17:11:08 +0000
(09:11 -0800)
Signed-off-by: Ben Pfaff <blp@nicira.com>
lib/table.c
patch
|
blob
|
history
diff --git
a/lib/table.c
b/lib/table.c
index ff11e7816ffcdccaf8dcd98dee1346a4f2636fc3..537fae97c32fbf6e8bf0e94eb46e6b005ebec810 100644
(file)
--- 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);