summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-24 15:13:14 -0400
committerAdam Jackson <ajax@redhat.com>2008-03-24 15:13:14 -0400
commit0aa2ae83518b14e927fb5b8ced182a4f25cecc76 (patch)
tree013e49a12bc885cb25811b1954445fff00b9cdd7
parent230197a970aec8d5550c2697249ba2e351b2de0b (diff)
Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
-rw-r--r--src/XF86VMode.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 75a49d2..2a281cc 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -1,5 +1,3 @@
-/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
-/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/*
Copyright (c) 1995 Kaleb S. KEITHLEY
@@ -29,7 +27,6 @@ or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
*/
-/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
@@ -967,11 +964,11 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
if (rep.vendorLength)
_XReadPad(dpy, monitor->vendor, rep.vendorLength);
else
- monitor->vendor = "";
+ monitor->vendor[0] = '\0';
if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength);
else
- monitor->model = "";
+ monitor->model[0] = '\0';
UnlockDisplay(dpy);
SyncHandle();