[Plplot-cvs] SF.net SVN: plplot:[11150] trunk/src/plctrl.c

[<and...@us...>]

Revision: 11150
          http://plplot.svn.sourceforge.net/plplot/?rev=11150&view=rev
Author:   andrewross
Date:     2010-08-24 11:07:53 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
Check return value of fgets when reading in .pal palette files. These could be user supplied and so the format is not guaranteed. Fixes gcc warning.

Modified Paths:
--------------
    trunk/src/plctrl.c

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2010-08-24 11:02:39 UTC (rev 11149)
+++ trunk/src/plctrl.c	2010-08-24 11:07:53 UTC (rev 11150)
@@ -1292,7 +1292,10 @@
 
         for ( i = 0; i < *number_colors; i++ )
         {
-            fgets( color_info, 30, fp );
+            if (fgets( color_info, 30, fp ) == NULL) {
+                err = 1;
+                break;
+            }
             color_info[strlen( color_info ) - 1] = '\0'; /* remove return character */
             if ( strlen( color_info ) == 7 )
             {
@@ -1469,7 +1472,12 @@
         }
     }
     /* Check for new file format */
-    fgets( color_info, 160, fp );
+    if (fgets( color_info, 160, fp ) == NULL) {
+        snprintf( msgbuf, 1024, "Error reading cmap1 .pal file %s\n",filename);
+        plwarn( msgbuf );
+        fclose( fp );
+        goto finish;
+    }
     if ( strncmp( color_info, "v2 ", 2 ) == 0 )
     {
         format_version = 1;
@@ -1483,7 +1491,12 @@
             plwarn( msgbuf );
             rgb = TRUE;
         }
-        fgets( color_info, 160, fp );
+        if (fgets( color_info, 160, fp ) == NULL) {
+            snprintf( msgbuf, 1024, "Error reading cmap1 .pal file %s\n",filename);
+            plwarn( msgbuf );
+            fclose( fp );
+            goto finish;
+        }
     }
 
     if ( sscanf( color_info, "%d\n", &number_colors ) != 1 || number_colors < 2 )
@@ -1510,7 +1523,12 @@
         /* Old tk file format */
         for ( i = 0; i < number_colors; i++ )
         {
-            fgets( color_info, 160, fp );
+            if (fgets( color_info, 160, fp ) == NULL) {
+                snprintf( msgbuf, 1024, "Error reading cmap1 .pal file %s\n",filename);
+                plwarn( msgbuf );
+                fclose( fp );
+                goto finish;
+            }
             /* Ensure string is null terminated if > 160 characters */
             color_info[159] = '\0';
             return_sscanf   = sscanf( color_info, "#%2x%2x%2x %d %d", &r_i, &g_i, &b_i, &pos_i, &rev_i );
@@ -1551,7 +1569,12 @@
         /* New floating point file version with support for alpha and rev values */
         for ( i = 0; i < number_colors; i++ )
         {
-            fgets( color_info, 160, fp );
+            if (fgets( color_info, 160, fp ) == NULL) {
+                snprintf( msgbuf, 1024, "Error reading cmap1 .pal file %s\n",filename);
+                plwarn( msgbuf );
+                fclose( fp );
+                goto finish;
+            }
             if ( sscanf( color_info, "%lf %lf %lf %lf %lf %d", &pos_d, &r_d, &g_d, &b_d, &a_d, &rev_i ) != 6 )
             {
                 snprintf( msgbuf, 1024, "Unrecognized cmap1 format (wrong number of items for version 2 of format) %s\n", color_info );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.