Nikolay Sivov : oleview: Fix a crash on null helpstring and name on library level.
Alexandre Julliard
julliard at winehq.org
Thu Apr 7 07:36:46 CDT 2011
Module: wine
Branch: stable
Commit: eab43474944319f04c7cdc4bf5b35abd0ddbe4aa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab43474944319f04c7cdc4bf5b35abd0ddbe4aa
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Dec 31 15:46:50 2010 +0300
oleview: Fix a crash on null helpstring and name on library level.
(cherry picked from commit cd028045f18e2314540c9e4add0d4b0d54bc9157)
---
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);
More information about the wine-cvs
mailing list