[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    oleview: Fix a crash on null helpstring and name on library level
From:       Nikolay Sivov <nsivov () codeweavers ! com>
Date:       2010-12-31 12:50:29
Message-ID: 4D1DD195.1090808 () codeweavers ! com
[Download RAW message or body]

Previous attempt was incorrect of course: no need to output empty 
helpstring() for example.

["0001-Fix-a-crash-on-null-helpstring-and-name-on-library-l.patch" (text/plain)]

From 7c642bc761b9169b679deb36e98e7919deba6637 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 31 Dec 2010 15:46:50 +0300
Subject: [PATCH 1/1] Fix a crash on null helpstring and name on library level

---
 programs/oleview/typelib.c |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c
index 7be31c9..2b69ec4 100644
--- a/programs/oleview/typelib.c
+++ b/programs/oleview/typelib.c
@@ -1227,20 +1227,26 @@ static int PopulateTree(void)
     AddSpaces(tld, TAB_SIZE);
     wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum);
     AddToTLDataStrW(tld, wszText);
-    AddToTLDataStrW(tld, wszComa);
-    AddToTLDataStrW(tld, wszNewLine);
-    AddSpaces(tld, TAB_SIZE);
-    AddToTLDataStrW(tld, wszHelpstring);
-    AddToTLDataStrW(tld, wszOpenBrackets2);
-    AddToTLDataStrW(tld, wszInvertedComa);
-    AddToTLDataStrW(tld, bstrData);
-    AddToTLDataStrW(tld, wszInvertedComa);
-    AddToTLDataStrW(tld, wszCloseBrackets2);
+
+    if (bstrData)
+    {
+        /* helpstring is optional */
+        AddToTLDataStrW(tld, wszComa);
+        AddToTLDataStrW(tld, wszNewLine);
+        AddSpaces(tld, TAB_SIZE);
+        AddToTLDataStrW(tld, wszHelpstring);
+        AddToTLDataStrW(tld, wszOpenBrackets2);
+        AddToTLDataStrW(tld, wszInvertedComa);
+        AddToTLDataStrW(tld, bstrData);
+        AddToTLDataStrW(tld, wszInvertedComa);
+        AddToTLDataStrW(tld, wszCloseBrackets2);
+    }
+
     AddToTLDataStrW(tld, wszNewLine);
     AddToTLDataStrW(tld, wszCloseBrackets1);
     AddToTLDataStrW(tld, wszNewLine);
     AddToTLDataStrW(tld, wszLibrary);
-    AddToTLDataStrW(tld, bstrName);
+    if (bstrName) AddToTLDataStrW(tld, bstrName);
     AddToTLDataStrW(tld, wszNewLine);
     AddToTLDataStrW(tld, wszOpenBrackets3);
     AddToTLDataStrW(tld, wszNewLine);
-- 
1.5.6.5





[prev in list] [next in list] [prev in thread] [next in thread]