From 7554e1bf29e5aef8e76f88bac2994ea45a924f2b Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri, 23 Sep 2005 00:27:07 +0000
Subject: [PATCH] Sun bug #6321613    
 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6321613>    
 xorgcfg dumps core when it reads a configuration file that has a     Monitor
 Section, but does not have a "VendorName" entry inside it.     (Henry Zhao,
 Sun Microsystems)

---
 hw/xfree86/utils/xorgcfg/interface.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index c8ffd005c..f3be79324 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -1317,11 +1317,16 @@ SetTip(xf86cfgDevice *device)
 
 	    if (monitor == NULL)
 		return;
-	    len = XmuSnprintf(buffer, sizeof(buffer),
-			      "Identifier \"%s\"\n"
-			      "Vendor     \"%s\"\n",
-			      monitor->mon_identifier,
-			      monitor->mon_vendor);
+	    if (monitor->mon_vendor != NULL)
+		len = XmuSnprintf(buffer, sizeof(buffer),
+				  "Identifier \"%s\"\n"
+				  "Vendor     \"%s\"\n",
+				  monitor->mon_identifier,
+				  monitor->mon_vendor);
+	    else
+		len = XmuSnprintf(buffer, sizeof(buffer),
+				  "Identifier \"%s\"\n",
+				  monitor->mon_identifier);
 	    option = monitor->mon_option_lst;
 	}   break;
 	case SCREEN: {