examples,test: check that calls to 'sscanf' write to output vars

Author: szsam

examples/server/pnmshow.c

@@ -51,7 +51,10 @@ int main(int argc,char** argv)
   } while(buffer[0]=='#');
 
   /* get width & height */
-  sscanf(buffer,"%d %d",&width,&height);
+  if(sscanf(buffer,"%d %d",&width,&height) != 2) {
+    printf("Failed to get width or height.\n");
+    exit(3);
+  }
   rfbLog("Got width %d and height %d.\n",width,height);
   if(picType!=BW)
 	fgets(buffer,1024,in);

examples/server/pnmshow24.c

@@ -50,7 +50,10 @@ int main(int argc,char** argv)
   } while(buffer[0]=='#');
 
   /* get width & height */
-  sscanf(buffer,"%d %d",&width,&height);
+  if(sscanf(buffer,"%d %d",&width,&height) != 2) {
+    printf("Failed to get width or height.\n");
+    exit(3);
+  }
   rfbLog("Got width %d and height %d.\n",width,height);
   fgets(buffer,1024,in);
 

test/bmp.c

@@ -122,15 +122,15 @@ int loadppm(int *fd, unsigned char **buf, int *w, int *h,
 		switch(totalread)
 		{
 			case 0:
-				if((numread=sscanf(temps, "%d %d %d", w, h, &scalefactor))==EOF)
+				if((numread=sscanf(temps, "%d %d %d", w, h, &scalefactor))!=3)
 					_throw("Read error");
 				break;
 			case 1:
-				if((numread=sscanf(temps, "%d %d", h, &scalefactor))==EOF)
+				if((numread=sscanf(temps, "%d %d", h, &scalefactor))!=2)
 					_throw("Read error");
 				break;
 			case 2:
-				if((numread=sscanf(temps, "%d", &scalefactor))==EOF)
+				if((numread=sscanf(temps, "%d", &scalefactor))!=1)
 					_throw("Read error");
 				break;
 		}