From 0e790ac35327a0b53a4a595a6429135317302269 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 18:22:26 -0800
Subject: progs/util: Fix memory leak if LoadYUVImage fails.

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 8e923b6eb4..134eb79100 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -438,6 +438,7 @@ GLushort *LoadYUVImage( const char *imageFile, GLint *width, GLint *height )
       fprintf(stderr,
               "Error in LoadYUVImage %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return NULL;
    }
 
-- 
cgit v1.2.3


From 28b8e4bcd76cc072b062e4c8575327c05ecb9a55 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 08:29:36 -0800
Subject: progs/util: Fix memory if LoadRGBMipmaps2 fails.

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 134eb79100..4e22bed81a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -305,6 +305,7 @@ GLboolean LoadRGBMipmaps2( const char *imageFile, GLenum target,
       fprintf(stderr,
               "Error in LoadRGBMipmaps %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return GL_FALSE;
    }
 
-- 
cgit v1.2.3


From 041cd0e110d41b543a0fe9cc484ae8373642912b Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 10:11:50 -0800
Subject: progs/util: Fix memory leak if LoadRGBImage fails.

---
 progs/util/readtex.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 4e22bed81a..ec27e20d68 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -357,6 +357,7 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
       fprintf(stderr,
               "Error in LoadRGBImage %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return NULL;
    }
 
@@ -365,8 +366,10 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
 
    bytes = image->sizeX * image->sizeY * image->components;
    buffer = (GLubyte *) malloc(bytes);
-   if (!buffer)
+   if (!buffer) {
+      FreeImage(image);
       return NULL;
+   }
 
    memcpy( (void *) buffer, (void *) image->data, bytes );
 
-- 
cgit v1.2.3


From 786d539511eb3c5a4101b11b7f8e90d60123ac46 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 11:04:24 -0800
Subject: progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index ec27e20d68..c57b66bd9d 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -250,6 +250,7 @@ static TK_RGBImageRec *tkRGBImageLoad(const char *fileName)
    final = (TK_RGBImageRec *)malloc(sizeof(TK_RGBImageRec));
    if (final == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      RawImageClose(raw);
       return NULL;
    }
    final->sizeX = raw->sizeX;
-- 
cgit v1.2.3


From 11905da8836822f7dd60c84b5eefc72e46c94b50 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 12:00:22 -0800
Subject: progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.

---
 progs/util/shaderutil.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index af50d64f51..aebf23a78c 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -95,6 +95,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      fclose(f);
       free(buffer);
       return 0;
    }
-- 
cgit v1.2.3


From d9508e8df9da4aa13bc223194c406081738bac91 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 13:49:31 -0800
Subject: progs/util: Fix memory leak if fopen fails in RawImageOpen.

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index c57b66bd9d..3922998fd5 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -109,6 +109,7 @@ static rawImageRec *RawImageOpen(const char *fileName)
          raw->file = fopen(baseName + 1, "rb");
       if(raw->file == NULL) {
          perror(fileName);
+         free(raw);
          return NULL;
       }
    }
-- 
cgit v1.2.3


From 6acb82dab0056f0d5f3522c7b063db8024ef81d8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 17 Nov 2009 19:22:11 -0700
Subject: progs/util: warn when GLSL not supported

---
 progs/util/shaderutil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'progs/util')

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index aebf23a78c..4fb3199a19 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -34,7 +34,8 @@ ShadersSupported(void)
       fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x.  This may not work.\n");
       return GL_TRUE;
    }
-   return GL_TRUE;
+   fprintf(stderr, "Sorry, GLSL not supported with this OpenGL.\n");
+   return GL_FALSE;
 }
 
 
-- 
cgit v1.2.3


From d36cb2396c942f05ba56c5b899792a507bb0f0fd Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 20 Nov 2009 11:22:13 -0800
Subject: progs/util: Fix memory leak if malloc fails in RawImageOpen.

---
 progs/util/readtex.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 3922998fd5..1e1183cf9a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -130,6 +130,12 @@ static rawImageRec *RawImageOpen(const char *fileName)
    if (raw->tmp == NULL || raw->tmpR == NULL || raw->tmpG == NULL ||
        raw->tmpB == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      free(raw->tmp);
+      free(raw->tmpR);
+      free(raw->tmpG);
+      free(raw->tmpB);
+      free(raw->tmpA);
+      free(raw);
       return NULL;
    }
 
@@ -139,6 +145,14 @@ static rawImageRec *RawImageOpen(const char *fileName)
       raw->rowSize = (GLint *)malloc(x);
       if (raw->rowStart == NULL || raw->rowSize == NULL) {
          fprintf(stderr, "Out of memory!\n");
+         free(raw->tmp);
+         free(raw->tmpR);
+         free(raw->tmpG);
+         free(raw->tmpB);
+         free(raw->tmpA);
+         free(raw->rowStart);
+         free(raw->rowSize);
+         free(raw);
          return NULL;
       }
       raw->rleEnd = 512 + (2 * x);
-- 
cgit v1.2.3


From e26135a744f740430e3dc341fa692544ba99c11e Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 20 Nov 2009 12:11:55 -0800
Subject: progs/util: Exit RawImageGetData early if malloc fails.

Prevents a null pointer deference later on.
---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 1e1183cf9a..81cb626e91 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -230,6 +230,7 @@ static void RawImageGetData(rawImageRec *raw, TK_RGBImageRec *final)
    final->data = (unsigned char *)malloc((raw->sizeX+1)*(raw->sizeY+1)*4);
    if (final->data == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      return;
    }
 
    ptr = final->data;
-- 
cgit v1.2.3


From da0883114b1dceceff8a38deea1bb870fda40464 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 23 Nov 2009 18:32:27 -0800
Subject: shaderutil: Fix detection of shaders

Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
---
 progs/util/shaderutil.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'progs/util')

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 4db950016b..629b6f1d97 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -25,7 +25,11 @@ GLboolean
 ShadersSupported(void)
 {
    const char *version = (const char *) glGetString(GL_VERSION);
-   if (version[0] == '2' && version[1] == '.') {
+
+   /* NVIDIA binary drivers will return "3.0.0", and they clearly support
+    * shaders.
+    */
+   if (version[0] >= '2' && version[1] == '.') {
       return GL_TRUE;
    }
    else if (glutExtensionSupported("GL_ARB_vertex_shader")
@@ -34,7 +38,7 @@ ShadersSupported(void)
       fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x.  This may not work.\n");
       return GL_TRUE;
    }
-   return GL_TRUE;
+   return GL_FALSE;
 }
 
 
-- 
cgit v1.2.3


From 4ca8e1680ed2e8437653c6f16f39438e51ce24ae Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 18:22:26 -0800
Subject: progs/util: Fix memory leak if LoadYUVImage fails. (cherry picked
 from commit 0e790ac35327a0b53a4a595a6429135317302269)

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 8e923b6eb4..134eb79100 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -438,6 +438,7 @@ GLushort *LoadYUVImage( const char *imageFile, GLint *width, GLint *height )
       fprintf(stderr,
               "Error in LoadYUVImage %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return NULL;
    }
 
-- 
cgit v1.2.3


From 84de1672d3efbfc3b2ae51633b0e503f15e5d62d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 08:29:36 -0800
Subject: progs/util: Fix memory if LoadRGBMipmaps2 fails. (cherry picked from
 commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 134eb79100..4e22bed81a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -305,6 +305,7 @@ GLboolean LoadRGBMipmaps2( const char *imageFile, GLenum target,
       fprintf(stderr,
               "Error in LoadRGBMipmaps %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return GL_FALSE;
    }
 
-- 
cgit v1.2.3


From f1172c4030dd0952dfdecda059beb39b1224a8ae Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 10:11:50 -0800
Subject: progs/util: Fix memory leak if LoadRGBImage fails. (cherry picked
 from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)

---
 progs/util/readtex.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 4e22bed81a..ec27e20d68 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -357,6 +357,7 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
       fprintf(stderr,
               "Error in LoadRGBImage %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return NULL;
    }
 
@@ -365,8 +366,10 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
 
    bytes = image->sizeX * image->sizeY * image->components;
    buffer = (GLubyte *) malloc(bytes);
-   if (!buffer)
+   if (!buffer) {
+      FreeImage(image);
       return NULL;
+   }
 
    memcpy( (void *) buffer, (void *) image->data, bytes );
 
-- 
cgit v1.2.3


From 772e00478124074c7b954fad52974057f0669a9b Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 11:04:24 -0800
Subject: progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
 (cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index ec27e20d68..c57b66bd9d 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -250,6 +250,7 @@ static TK_RGBImageRec *tkRGBImageLoad(const char *fileName)
    final = (TK_RGBImageRec *)malloc(sizeof(TK_RGBImageRec));
    if (final == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      RawImageClose(raw);
       return NULL;
    }
    final->sizeX = raw->sizeX;
-- 
cgit v1.2.3


From 305d4f147ea86d87706dbaf2caad6a131c59fe80 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 13:49:31 -0800
Subject: progs/util: Fix memory leak if fopen fails in RawImageOpen. (cherry
 picked from commit d9508e8df9da4aa13bc223194c406081738bac91)

---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index c57b66bd9d..3922998fd5 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -109,6 +109,7 @@ static rawImageRec *RawImageOpen(const char *fileName)
          raw->file = fopen(baseName + 1, "rb");
       if(raw->file == NULL) {
          perror(fileName);
+         free(raw);
          return NULL;
       }
    }
-- 
cgit v1.2.3


From 0a6acecb35aa5701ee82cf17c2561c172612cb6e Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 20 Nov 2009 11:22:13 -0800
Subject: progs/util: Fix memory leak if malloc fails in RawImageOpen. (cherry
 picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)

---
 progs/util/readtex.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 3922998fd5..1e1183cf9a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -130,6 +130,12 @@ static rawImageRec *RawImageOpen(const char *fileName)
    if (raw->tmp == NULL || raw->tmpR == NULL || raw->tmpG == NULL ||
        raw->tmpB == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      free(raw->tmp);
+      free(raw->tmpR);
+      free(raw->tmpG);
+      free(raw->tmpB);
+      free(raw->tmpA);
+      free(raw);
       return NULL;
    }
 
@@ -139,6 +145,14 @@ static rawImageRec *RawImageOpen(const char *fileName)
       raw->rowSize = (GLint *)malloc(x);
       if (raw->rowStart == NULL || raw->rowSize == NULL) {
          fprintf(stderr, "Out of memory!\n");
+         free(raw->tmp);
+         free(raw->tmpR);
+         free(raw->tmpG);
+         free(raw->tmpB);
+         free(raw->tmpA);
+         free(raw->rowStart);
+         free(raw->rowSize);
+         free(raw);
          return NULL;
       }
       raw->rleEnd = 512 + (2 * x);
-- 
cgit v1.2.3


From a0ac8fc7d8d946183ba0506a8134a6e55819e151 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 20 Nov 2009 12:11:55 -0800
Subject: progs/util: Exit RawImageGetData early if malloc fails.

Prevents a null pointer deference later on.
(cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
---
 progs/util/readtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 1e1183cf9a..81cb626e91 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -230,6 +230,7 @@ static void RawImageGetData(rawImageRec *raw, TK_RGBImageRec *final)
    final->data = (unsigned char *)malloc((raw->sizeX+1)*(raw->sizeY+1)*4);
    if (final->data == NULL) {
       fprintf(stderr, "Out of memory!\n");
+      return;
    }
 
    ptr = final->data;
-- 
cgit v1.2.3


From 5683d7d43fd5a02b72f30a2a6d6a9bfeaf2fa781 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 3 Nov 2009 14:41:08 -0700
Subject: progs/util: Fix memory leak if fail to load/compile shader

Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
---
 progs/util/shaderutil.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'progs/util')

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 629b6f1d97..36e07842c6 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -88,6 +88,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
    f = fopen(filename, "r");
    if (!f) {
       fprintf(stderr, "Unable to open shader file %s\n", filename);
+      free(buffer);
       return 0;
    }
 
@@ -98,6 +99,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      free(buffer);
       return 0;
    }
 
-- 
cgit v1.2.3


From 4fb5ae7233e5c358e579ced6155f32461f6edf2d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 12:00:22 -0800
Subject: progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
 (cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)

---
 progs/util/shaderutil.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/util')

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 36e07842c6..adcf2149e2 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -99,6 +99,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      fclose(f);
       free(buffer);
       return 0;
    }
-- 
cgit v1.2.3


From bc0509bba8cc962a4ee2dafd684e153b3060262d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 10 Dec 2009 13:24:15 -0800
Subject: progs/util: Byte swap individual members of struct _rawImageRec.

---
 progs/util/readtex.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 81cb626e91..d1c50a494a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -117,7 +117,12 @@ static rawImageRec *RawImageOpen(const char *fileName)
    fread(raw, 1, 12, raw->file);
 
    if (swapFlag) {
-      ConvertShort(&raw->imagic, 6);
+      ConvertShort(&raw->imagic, 1);
+      ConvertShort(&raw->type, 1);
+      ConvertShort(&raw->dim, 1);
+      ConvertShort(&raw->sizeX, 1);
+      ConvertShort(&raw->sizeY, 1);
+      ConvertShort(&raw->sizeZ, 1);
    }
 
    raw->tmp = (unsigned char *)malloc(raw->sizeX*256);
-- 
cgit v1.2.3


From cdc69e34694a16e9f762aba45d7eba05e9dc8514 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 25 Dec 2009 23:13:50 -0800
Subject: progs/util: Silence warn_unused_result warnings.

---
 progs/util/readtex.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'progs/util')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index d1c50a494a..f6f511481c 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -9,6 +9,7 @@
 
 #include <GL/gl.h>
 #include <GL/glu.h>
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h> 
 #include <string.h>
@@ -89,6 +90,7 @@ static rawImageRec *RawImageOpen(const char *fileName)
    rawImageRec *raw;
    GLenum swapFlag;
    int x;
+   size_t result;
 
    endianTest.testWord = 1;
    if (endianTest.testByte[0] == 1) {
@@ -114,7 +116,8 @@ static rawImageRec *RawImageOpen(const char *fileName)
       }
    }
 
-   fread(raw, 1, 12, raw->file);
+   result = fread(raw, 1, 12, raw->file);
+   assert(result == 12);
 
    if (swapFlag) {
       ConvertShort(&raw->imagic, 1);
@@ -162,8 +165,10 @@ static rawImageRec *RawImageOpen(const char *fileName)
       }
       raw->rleEnd = 512 + (2 * x);
       fseek(raw->file, 512, SEEK_SET);
-      fread(raw->rowStart, 1, x, raw->file);
-      fread(raw->rowSize, 1, x, raw->file);
+      result = fread(raw->rowStart, 1, x, raw->file);
+      assert(result == x);
+      result = fread(raw->rowSize, 1, x, raw->file);
+      assert(result == x);
       if (swapFlag) {
          ConvertLong(raw->rowStart, (long) (x/sizeof(GLuint)));
          ConvertLong((GLuint *)raw->rowSize, (long) (x/sizeof(GLint)));
@@ -193,11 +198,13 @@ static void RawImageGetRow(rawImageRec *raw, unsigned char *buf, int y, int z)
 {
    unsigned char *iPtr, *oPtr, pixel;
    int count, done = 0;
+   size_t result;
 
    if ((raw->type & 0xFF00) == 0x0100) {
       fseek(raw->file, (long) raw->rowStart[y+z*raw->sizeY], SEEK_SET);
-      fread(raw->tmp, 1, (unsigned int)raw->rowSize[y+z*raw->sizeY],
-            raw->file);
+      result = fread(raw->tmp, 1, (unsigned int)raw->rowSize[y+z*raw->sizeY],
+                     raw->file);
+      assert(result == (unsigned int)raw->rowSize[y+z*raw->sizeY]);
       
       iPtr = raw->tmp;
       oPtr = buf;
@@ -222,7 +229,8 @@ static void RawImageGetRow(rawImageRec *raw, unsigned char *buf, int y, int z)
    } else {
       fseek(raw->file, 512+(y*raw->sizeX)+(z*raw->sizeX*raw->sizeY),
             SEEK_SET);
-      fread(buf, 1, raw->sizeX, raw->file);
+      result = fread(buf, 1, raw->sizeX, raw->file);
+      assert(result == raw->sizeX);
    }
 }
 
-- 
cgit v1.2.3