Mesa (master): glsl/apps: Handle ftell errors in non-debug builds.

Vinson Lee vlee at kemper.freedesktop.org
Fri Jul 16 01:46:01 UTC 2010


Module: Mesa
Branch: master
Commit: 643f5ea1e0402d05e71d4f0340ea8f29042b8c79
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=643f5ea1e0402d05e71d4f0340ea8f29042b8c79

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Jul 15 18:45:20 2010 -0700

glsl/apps: Handle ftell errors in non-debug builds.

---

 src/glsl/apps/compile.c  |    3 +++
 src/glsl/apps/process.c  |    3 +++
 src/glsl/apps/purify.c   |    3 +++
 src/glsl/apps/tokenise.c |    3 +++
 src/glsl/apps/version.c  |    3 +++
 5 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c
index 5073b0d..3aa4fd4 100644
--- a/src/glsl/apps/compile.c
+++ b/src/glsl/apps/compile.c
@@ -82,6 +82,9 @@ main(int argc,
    fseek(in, 0, SEEK_END);
    size = ftell(in);
    assert(size != -1);
+   if (size == -1) {
+      return 1;
+   }
    fseek(in, 0, SEEK_SET);
 
    out = fopen(argv[3], "w");
diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index c8a1a18..caf72a7 100644
--- a/src/glsl/apps/process.c
+++ b/src/glsl/apps/process.c
@@ -59,6 +59,9 @@ main(int argc,
    fseek(in, 0, SEEK_END);
    size = ftell(in);
    assert(size != -1);
+   if (size == -1) {
+      return 1;
+   }
    fseek(in, 0, SEEK_SET);
 
    out = fopen(argv[2], "wb");
diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c
index 5ab6bae..0f09b15 100644
--- a/src/glsl/apps/purify.c
+++ b/src/glsl/apps/purify.c
@@ -58,6 +58,9 @@ main(int argc,
    fseek(in, 0, SEEK_END);
    size = ftell(in);
    assert(size != -1);
+   if (size == -1) {
+      return 1;
+   }
    fseek(in, 0, SEEK_SET);
 
    out = fopen(argv[2], "wb");
diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c
index b4c6d60..f89f47d 100644
--- a/src/glsl/apps/tokenise.c
+++ b/src/glsl/apps/tokenise.c
@@ -58,6 +58,9 @@ main(int argc,
    fseek(in, 0, SEEK_END);
    size = ftell(in);
    assert(size != -1);
+   if (size == -1) {
+      return 1;
+   }
    fseek(in, 0, SEEK_SET);
 
    out = fopen(argv[2], "wb");
diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c
index 9820ad9..fa5c226 100644
--- a/src/glsl/apps/version.c
+++ b/src/glsl/apps/version.c
@@ -57,6 +57,9 @@ main(int argc,
    fseek(in, 0, SEEK_END);
    size = ftell(in);
    assert(size != -1);
+   if (size == -1) {
+      return 1;
+   }
    fseek(in, 0, SEEK_SET);
 
    out = fopen(argv[2], "wb");




More information about the mesa-commit mailing list