summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwalter <wharms@bfs.de>2007-11-22 17:37:09 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-11-28 10:23:48 -0800
commitbe13ab935be74f19c4f98c3b51b61154f7da9dcc (patch)
treef2d861917a477135a333047a26dd27c6e3ec23f9
parent235821c4198dc101cc52c83295dab96c0bcc3e8c (diff)
X.Org Bug #13357: xcmsdb segfaults on xcms.txt
<http://bugs.freedesktop.org/show_bug.cgi?id=13357>
-rw-r--r--loadData.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/loadData.c b/loadData.c
index 8d2cbac..340fd96 100644
--- a/loadData.c
+++ b/loadData.c
@@ -1479,7 +1479,7 @@ LoadSCCData(Display *pDpy, int screenNumber, char *filename, int targetFormat)
}
token1 = strtok((char*)NULL, DATA_DELIMS);
- if ((strcmp(token1, TXT_FORMAT_VERSION) != 0) &&
+ if ( token1 && (strcmp(token1, TXT_FORMAT_VERSION) != 0) &&
(strcmp(token1, "0.3") != 0)) {
fprintf(stderr,
"Screen data format version mismatch in file %s-- expected %s, found %s\n",