From 474f754282c06014fa0f687c08f4e97323166f83 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@vmware.com>
Date: Sat, 13 Jun 2009 13:50:45 +0200
Subject: glsl: Raise an error on an unfinished comment block.

---
 src/glsl/pp/sl_pp_purify.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/glsl/pp/sl_pp_purify.c')

diff --git a/src/glsl/pp/sl_pp_purify.c b/src/glsl/pp/sl_pp_purify.c
index 7fbfc78d42..ded4dc8963 100644
--- a/src/glsl/pp/sl_pp_purify.c
+++ b/src/glsl/pp/sl_pp_purify.c
@@ -152,6 +152,9 @@ _purify_comment(const char *input,
                   return eaten;
                }
             }
+            if (next == '\0') {
+               return 0;
+            }
          }
       }
    }
@@ -171,8 +174,13 @@ sl_pp_purify(const char *input,
 
    for (;;) {
       char c;
+      unsigned int eaten;
 
-      input += _purify_comment(input, &c);
+      eaten = _purify_comment(input, &c);
+      if (!eaten) {
+         return -1;
+      }
+      input += eaten;
 
       if (out_len >= out_max) {
          unsigned int new_max = out_max;
-- 
cgit v1.2.3