void-packages/srcpkgs/abiword/patches/abiword-3.0.0-fix-crash__gentoo.patch

34 lines
1.1 KiB
Diff
Raw Normal View History

2013-10-28 02:28:05 +00:00
commit e0e81e6c2d7f2478b9effc8476b62425ca2c12cd
Author: Hubert Figuière <hub@figuiere.net>
Date: Wed Oct 16 22:48:36 2013 -0400
Bug 13564 - Fix crash in abw to HTML conversion.
diff --git a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
index 86c57ec..b9dace1 100644
--- src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
+++ src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
@@ -2232,12 +2232,18 @@ void IE_Exp_HTML_Listener::_openList(PT_AttrPropIndex api, bool recursiveCall)
_openList(api, true);
}
}
-
- }else
+ }
+ else
{
- const gchar* szListStyle;
+ const gchar* szListStyle = NULL;
pAP->getProperty("list-style", szListStyle);
- bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0;
+ bool isOrdered = szListStyle
+ && (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0);
+#ifdef DEBUG
+ if(!szListStyle) {
+ UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n"));
+ }
+#endif
ListInfo info;
if (iCurrentLevel == 0)
{