Blame SOURCES/rrdtool-1.4.8-imginfo-check.patch

ba7b08
diff -up rrdtool-1.4.8/src/rrd_graph.c.orig2 rrdtool-1.4.8/src/rrd_graph.c
ba7b08
--- rrdtool-1.4.8/src/rrd_graph.c.orig2	2013-05-23 09:55:07.000000000 +0200
ba7b08
+++ rrdtool-1.4.8/src/rrd_graph.c	2013-06-03 15:56:35.820593192 +0200
ba7b08
@@ -4022,6 +4022,12 @@ rrd_info_t *rrd_graph_v(
ba7b08
         char     *path;
ba7b08
         char     *filename;
ba7b08
 
ba7b08
+        if (bad_format_imginfo(im.imginfo)) {
ba7b08
+            rrd_info_free(im.grinfo);
ba7b08
+            im_free(&im);
ba7b08
+            rrd_set_error("bad format for imginfo");
ba7b08
+            return NULL;
ba7b08
+        }
ba7b08
         path = strdup(im.graphfile);
ba7b08
         filename = basename(path);
ba7b08
         info.u_str =
ba7b08
@@ -4827,6 +4833,51 @@ int bad_format(
ba7b08
 }
ba7b08
 
ba7b08
 
ba7b08
+int bad_format_imginfo(
ba7b08
+    char *fmt)
ba7b08
+{
ba7b08
+    char     *ptr;
ba7b08
+    int       n = 0;
ba7b08
+
ba7b08
+    ptr = fmt;
ba7b08
+    while (*ptr != '\0')
ba7b08
+        if (*ptr++ == '%') {
ba7b08
+
ba7b08
+            /* line cannot end with percent char */
ba7b08
+            if (*ptr == '\0')
ba7b08
+                return 1;
ba7b08
+            /* '%%' is allowed */
ba7b08
+            if (*ptr == '%')
ba7b08
+                ptr++;
ba7b08
+            /* '%s', '%S' are allowed */
ba7b08
+            else if (*ptr == 's' || *ptr == 'S') {
ba7b08
+                n = 1;
ba7b08
+                ptr++;
ba7b08
+            }
ba7b08
+
ba7b08
+            /* or else '% 4lu' and such are allowed */
ba7b08
+            else {
ba7b08
+                /* optional padding character */
ba7b08
+                if (*ptr == ' ')
ba7b08
+                    ptr++;
ba7b08
+                /* This should take care of 'm' */
ba7b08
+                while (*ptr >= '0' && *ptr <= '9')
ba7b08
+                    ptr++;
ba7b08
+                /* 'lu' must follow here */
ba7b08
+                if (*ptr++ != 'l')
ba7b08
+                    return 1;
ba7b08
+                if (*ptr == 'u')
ba7b08
+                    ptr++;
ba7b08
+                else
ba7b08
+                    return 1;
ba7b08
+                n++;
ba7b08
+            }
ba7b08
+        }
ba7b08
+
ba7b08
+    return (n != 3);
ba7b08
+}
ba7b08
+
ba7b08
+
ba7b08
 int vdef_parse(
ba7b08
     struct graph_desc_t
ba7b08
     *gdes,