mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on abi2010-1.doc example

Browse Source 
Change-Id: Ib3e43e14f9223bc53f20f1241d9b8c0eaa5470ad
This commit is contained in:
Caolán McNamara
2013-11-28 09:53:47 +00:00
parent 8fe3c0bd64
commit 3b65cd2440
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch vendored Normal file
View File

@@ -0,0 +1,30 @@
From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 28 Nov 2013 09:50:00 +0000
Subject: [PATCH] Fix crash on abi2010-1.doc example
---
src/lib/FB2Parser.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
index d258c09..3cd3e3c 100644
--- a/src/lib/FB2Parser.cpp
+++ b/src/lib/FB2Parser.cpp
@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext *const context, const xmlTe
{
case XML_READER_TYPE_ELEMENT :
{
- const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
- const EBOOKToken *ns = getFB2Token(xmlTextReaderConstNamespaceUri(reader));
+ const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
+ const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
+
+ const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
+ const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
if (!name || !ns)
// TODO: unknown elements should not be skipped entirely, but
--
1.8.3.1

6
external/libebook/UnpackedTarball_libebook.mk vendored
View File

@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libebook))
$(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: