diff options
| author | Bart Massey <bart@cs.pdx.edu> | 2008-04-04 18:58:45 -0700 |
|---|---|---|
| committer | Bart Massey <bart@cs.pdx.edu> | 2008-04-04 18:58:45 -0700 |
| commit | a19f9c65ee9e5e5d783feaa84998c36439b0288b (patch) | |
| tree | e6798e0fdcd63e25bf1805ed25da4ac3a479c38c | |
| parent | 12e8d0d01dd72ce98e7683ddb1bde181b7ed246f (diff) | |
| download | xorg-lib-libX11-a19f9c65ee9e5e5d783feaa84998c36439b0288b.tar.gz | |
added error check in Xcms color file parser; closes bug #15305
| -rw-r--r-- | src/xcms/cmsColNm.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |