1 files changed, 8 insertions, 3 deletions
diff --git a/progs/redbook/convolution.c b/progs/redbook/convolution.c
index 0543379f24..c04a8727a7 100644
--- a/progs/redbook/convolution.c
+++ b/progs/redbook/convolution.c
@@ -75,6 +75,7 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 {
     int       n;
     GLubyte*  pixels;
+    size_t    num_read;
 
     FILE* infile = fopen( filename, "rb" );
 
@@ -83,8 +84,10 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
         exit(1);
     }
 
-    fread( width, sizeof( GLsizei ), 1, infile );
-    fread( height, sizeof( GLsizei ), 1, infile );
+    num_read = fread( width, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
+    num_read = fread( height, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
 
     *width = bswap(*width);
     *height = bswap(*height);
@@ -97,10 +100,12 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
     pixels = (GLubyte *) malloc( n * sizeof( GLubyte ));
     if ( !pixels ) {
 	fprintf( stderr, "Unable to malloc() bytes for pixels\n" );
+	fclose( infile );
 	return NULL;
     }
 
-    fread( pixels, sizeof( GLubyte ), n, infile );
+    num_read = fread( pixels, sizeof( GLubyte ), n, infile );
+    assert(num_read == n);
     
     fclose( infile );