Commit 6ce83731 authored by Yuri N. Sedunov's avatar Yuri N. Sedunov Committed by Girar Builder pender robot
parent 6b49f2e8
copy: *.patch
tar.gz: abiword name=abiword-3.0.0
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
--- a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
+++ b/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)
{
......@@ -9,7 +9,7 @@
Name: %_name-%abi_ver
Version: %ver_major.0
Release: alt1
Release: alt2
Summary: Lean and fast full-featured word processor
Group: Office
......@@ -17,6 +17,8 @@ License: GPL
Url: http://www.abisource.com/
Source: http://www.abisource.com/downloads/abiword/%version/source/%_name-%version.tar.gz
# http://bugzilla.abisource.com/show_bug.cgi?id=13564
Patch: abiword-3.0-up-13564.patch
Obsoletes: abisuite, abisuite-koi8, abisuite-cp1251, abisuite-iso8859-8
Conflicts: %_name %_name-light
......@@ -73,6 +75,7 @@ Conflicts: %_name-devel %_name-light-devel
%prep
%setup -n %_name-%version
%patch -p1
%build
%autoreconf
......@@ -112,6 +115,9 @@ Conflicts: %_name-devel %_name-light-devel
%_pkgconfigdir/*
%changelog
* Fri Oct 18 2013 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt2
- fixed http://bugzilla.abisource.com/show_bug.cgi?id=13564
* Mon Oct 14 2013 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt1
- 3.0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment