From: Florian Forster <octo@verplant.org>
Date: Thu, 9 Sep 2010 15:15:55 +0000 (+0200)
Subject: src/graph_def.c: Check for NULL pointers when printing strings.
X-Git-Tag: v4.0.0~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=99b10b920e1e1687003edaf1f882d14b08bcd70c;p=collection4.git

src/graph_def.c: Check for NULL pointers when printing strings.
---

diff --git a/src/graph_def.c b/src/graph_def.c
index c7ecb98..d01db8e 100644
--- a/src/graph_def.c
+++ b/src/graph_def.c
@@ -156,7 +156,10 @@ static int def_to_json_recursive (const graph_def_t *def, /* {{{ */
   if (def == NULL)
     return (0);
 
-  snprintf (color, sizeof (color), "#%06"PRIx32, def->color);
+  if (def->color < 0x00ffffff)
+    snprintf (color, sizeof (color), "#%06"PRIx32, def->color);
+  else
+    strncpy (color, "random", sizeof (color));
   color[sizeof (color) - 1] = 0;
 
   yajl_gen_map_open (handler);
@@ -166,18 +169,27 @@ static int def_to_json_recursive (const graph_def_t *def, /* {{{ */
 
   yajl_gen_string_cast (handler, "select", strlen ("select"));
   ident_to_json (def->select, handler);
-  yajl_gen_string_cast (handler, "ds_name", strlen ("ds_name"));
-  yajl_gen_string_cast (handler, def->ds_name, strlen (def->ds_name));
-  yajl_gen_string_cast (handler, "legend", strlen ("legend"));
-  yajl_gen_string_cast (handler, def->legend, strlen (def->legend));
+  if (def->ds_name != NULL)
+  {
+    yajl_gen_string_cast (handler, "ds_name", strlen ("ds_name"));
+    yajl_gen_string_cast (handler, def->ds_name, strlen (def->ds_name));
+  }
+  if (def->legend != NULL)
+  {
+    yajl_gen_string_cast (handler, "legend", strlen ("legend"));
+    yajl_gen_string_cast (handler, def->legend, strlen (def->legend));
+  }
   yajl_gen_string_cast (handler, "color", strlen ("color"));
   yajl_gen_string_cast (handler, color, strlen (color));
   yajl_gen_string_cast (handler, "stack", strlen ("stack"));
   yajl_gen_bool   (handler, def->stack);
   yajl_gen_string_cast (handler, "area", strlen ("area"));
   yajl_gen_bool   (handler, def->area);
-  yajl_gen_string_cast (handler, "format", strlen ("format"));
-  yajl_gen_string_cast (handler, def->format, strlen (def->format));
+  if (def->format != NULL)
+  {
+    yajl_gen_string_cast (handler, "format", strlen ("format"));
+    yajl_gen_string_cast (handler, def->format, strlen (def->format));
+  }
 
   yajl_gen_map_close (handler);