From bf5e5fcff80a294fd4d6e051d777ba7f9ecb76a4 Mon Sep 17 00:00:00 2001 From: Monsta Date: Thu, 27 Nov 2014 11:20:07 +0300 Subject: epub backend: more anti-NULL protection for epub_document_set_index_pages --- backend/epub/epub-document.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'backend') diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c index 0a098e48..8651d029 100644 --- a/backend/epub/epub-document.c +++ b/backend/epub/epub-document.c @@ -1579,6 +1579,9 @@ page_set_function(linknode *Link, GList *contentList) static void epub_document_set_index_pages(GList *index,GList *contentList) { + g_return_if_fail (index != NULL); + g_return_if_fail (contentList != NULL); + g_list_foreach(index,(GFunc)page_set_function,contentList); } @@ -1706,7 +1709,7 @@ epub_document_load (EvDocument* document, epub_document->contentList = setup_document_content_list (contentOpfUri,&err,epub_document->documentdir); - if (epub_document->index != NULL) + if (epub_document->index != NULL && epub_document->contentList != NULL) epub_document_set_index_pages(epub_document->index, epub_document->contentList); epub_document_add_mathJax(contentOpfUri,epub_document->documentdir); -- cgit v1.2.1