mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 00:09:15 -04:00
3b22ad40b1
Change library dependensies to use USES= where applicable. Build ports documentation and examples, depending on respective option. Add two new options, NLS and GRAPH, the GRAPH option enables the rrdtool graph command, which pulls in cario and a lot of other dependencies. [1] Add missing dependencies. Becase of shlib version bump, bump portrevision on depending ports. PR: 192024 [1] (based on) Submitted by: asomers Approved by: portmgr (blanket, portrevision bumps)
68 lines
1.7 KiB
C
68 lines
1.7 KiB
C
--- src/rrd_graph.c.orig 2013-05-23 09:55:07.000000000 +0200
|
|
+++ src/rrd_graph.c 2014-07-20 22:11:58.000000000 +0200
|
|
@@ -305,6 +305,52 @@
|
|
|
|
#undef conv_if
|
|
|
|
+
|
|
+static int bad_format_imginfo(
|
|
+ char *fmt)
|
|
+{
|
|
+ char *ptr;
|
|
+ int n = 0;
|
|
+
|
|
+ ptr = fmt;
|
|
+ while (*ptr != '\0')
|
|
+ if (*ptr++ == '%') {
|
|
+
|
|
+ /* line cannot end with percent char */
|
|
+ if (*ptr == '\0')
|
|
+ return 1;
|
|
+ /* '%%' is allowed */
|
|
+ if (*ptr == '%')
|
|
+ ptr++;
|
|
+ /* '%s', '%S' are allowed */
|
|
+ else if (*ptr == 's' || *ptr == 'S') {
|
|
+ n = 1;
|
|
+ ptr++;
|
|
+ }
|
|
+
|
|
+ /* or else '% 4lu' and such are allowed */
|
|
+ else {
|
|
+ /* optional padding character */
|
|
+ if (*ptr == ' ')
|
|
+ ptr++;
|
|
+ /* This should take care of 'm' */
|
|
+ while (*ptr >= '0' && *ptr <= '9')
|
|
+ ptr++;
|
|
+ /* 'lu' must follow here */
|
|
+ if (*ptr++ != 'l')
|
|
+ return 1;
|
|
+ if (*ptr == 'u')
|
|
+ ptr++;
|
|
+ else
|
|
+ return 1;
|
|
+ n++;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return (n != 3);
|
|
+}
|
|
+
|
|
+
|
|
int im_free(
|
|
image_desc_t *im)
|
|
{
|
|
@@ -4022,6 +4068,12 @@
|
|
char *path;
|
|
char *filename;
|
|
|
|
+ if (bad_format_imginfo(im.imginfo)) {
|
|
+ rrd_info_free(im.grinfo);
|
|
+ im_free(&im);
|
|
+ rrd_set_error("bad format for imginfo");
|
|
+ return NULL;
|
|
+ }
|
|
path = strdup(im.graphfile);
|
|
filename = basename(path);
|
|
info.u_str =
|