From a19f9c65ee9e5e5d783feaa84998c36439b0288b Mon Sep 17 00:00:00 2001
From: Bart Massey <bart@cs.pdx.edu>
Date: Fri, 4 Apr 2008 18:58:45 -0700
Subject: added error check in Xcms color file parser; closes bug #15305

---
 src/xcms/cmsColNm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c
index c48b85ab..eacff2f3 100644
--- a/src/xcms/cmsColNm.c
+++ b/src/xcms/cmsColNm.c
@@ -738,7 +738,12 @@ LoadColornameDB(void)
 	return(XcmsFailure);
     }
 
-    stringSectionSize(stream, &nEntries, &size);
+    if (stringSectionSize(stream, &nEntries, &size) != XcmsSuccess ||
+	nEntries == 0) {
+	(void) fclose(stream);
+	XcmsColorDbState = XcmsDbInitFailure;
+	return(XcmsFailure);
+    }
     rewind(stream);
 
     strings = (char *) Xmalloc(size);
-- 
cgit v1.2.1