summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-01-31 13:16:30 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-01-31 13:16:30 +0000
commit8bdd96726009f79bc3209ded4e8ebc1a05e544c8 (patch)
treeb3c5abdbd195ec6a08f98271ece54527e0761bea
parent45e67e363e19a481cb8001574d0238ad42e10e60 (diff)
parent54a1afa9a8d49171fdbbbe75220312faa936f330 (diff)
Merge branch 'cygwin-patches-for-1.11' into cygwin-release-1.11xserver-cygwin-1.11.4-2
-rw-r--r--hw/xwin/glx/indirect.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 86fef55d1..a5b225102 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -479,6 +479,7 @@ glxLogExtensions(const char *prefix, const char *extensions)
}
strl = strtok(str, " ");
+ if (strl == NULL) strl = "";
ErrorF("%s%s", prefix, strl);
length = strlen(prefix) + strlen(strl);