[GRASS-SVN] r69667 - grass/trunk/display/d.linegraph

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2016-10-03 16:28:48 -0700 (Mon, 03 Oct 2016)
New Revision: 69667

Modified:
   grass/trunk/display/d.linegraph/main.c
Log:
d.linegraph: fix bad allocation in r69621 and GCC -Wshadow

Modified: grass/trunk/display/d.linegraph/main.c
===================================================================
--- grass/trunk/display/d.linegraph/main.c	2016-10-03 23:14:30 UTC (rev 69666)
+++ grass/trunk/display/d.linegraph/main.c	2016-10-03 23:28:48 UTC (rev 69667)
@@ -291,25 +291,29 @@
     }
     else if (color_table_opt->answer) {
         struct Colors colors;
+
         Rast_init_colors(&colors);
         Rast_make_colors(&colors, color_table_opt->answer, 1, num_y_files);
-        int* values = G_malloc(sizeof(int));
-        unsigned char* r = G_malloc(sizeof(unsigned char));
-        unsigned char* g = G_malloc(sizeof(unsigned char));
-        unsigned char* b = G_malloc(sizeof(unsigned char));
-        unsigned char* set = G_malloc(sizeof(unsigned char));
+
+        int* values = G_malloc(num_y_files * sizeof(int));
+        unsigned char* rbuf = G_malloc(num_y_files * sizeof(unsigned char));
+        unsigned char* gbuf = G_malloc(num_y_files * sizeof(unsigned char));
+        unsigned char* bbuf = G_malloc(num_y_files * sizeof(unsigned char));
+        unsigned char* set = G_malloc(num_y_files * sizeof(unsigned char));
+
         for (i = 0; i < num_y_files; i++)
             values[i] = i + 1;
-        Rast_lookup_c_colors(values, r, g, b, set, num_y_files, &colors);
+        Rast_lookup_c_colors(values, rbuf, gbuf, bbuf, set, num_y_files, &colors);
+        /* no need to check 'set' because we generated the range */
         for (i = 0; i < num_y_files; i++) {
             /* the in list is indexed from 1 */
-            in[i + 1].r = r[i];
-            in[i + 1].g = g[i];
-            in[i + 1].b = b[i];
+            in[i + 1].r = rbuf[i];
+            in[i + 1].g = gbuf[i];
+            in[i + 1].b = bbuf[i];
         }
-        G_free(r);
-        G_free(g);
-        G_free(b);
+        G_free(rbuf);
+        G_free(gbuf);
+        G_free(bbuf);
         G_free(set);
     }
     else