public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: raveit65 <raveit65.sun@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/atril] f44: update to 1.28.6
Date: Sat, 06 Jun 2026 21:26:26 GMT [thread overview]
Message-ID: <178078118682.1.11514736311561700514.rpms-atril-d4b21f6b6446@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/atril
Branch : f44
Commit : d4b21f6b64461e4cc2056f3972d0042b74ffcbd0
Author : raveit65 <raveit65.sun@gmail.com>
Date : 2026-06-06T23:09:22+02:00
Stats : +64/-77 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/atril/c/d4b21f6b64461e4cc2056f3972d0042b74ffcbd0?branch=f44
Log:
update to 1.28.6
- fix rhbz (#2485431)
---
diff --git a/.gitignore b/.gitignore
index 9b6a82f..a702a89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
/atril-1.28.0.tar.xz
/atril-1.28.1.tar.xz
/atril-1.28.5.tar.xz
+/atril-1.28.6.tar.xz
diff --git a/atril.spec b/atril.spec
index 134cd39..f490f4e 100644
--- a/atril.spec
+++ b/atril.spec
@@ -1,6 +1,6 @@
Name: atril
-Version: 1.28.5
+Version: 1.28.6
Release: %autorelease
Summary: Document viewer
# Automatically converted from old format: GPLv2+ and LGPLv2+ and MIT - review is highly recommended.
@@ -8,6 +8,8 @@ License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+ AND LicenseRef-C
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.28/%{name}-%{version}.tar.xz
+Patch1: atril_0001-epub-add-NULL-guards-to-prevent-crashes-with-malform.patch
+
BuildRequires: gcc-c++
BuildRequires: gtk3-devel
BuildRequires: poppler-glib-devel
diff --git a/atril_0001-epub-Avoid-crash-when-index-list-has-extraneous-entr-1.26.patch b/atril_0001-epub-Avoid-crash-when-index-list-has-extraneous-entr-1.26.patch
deleted file mode 100644
index 16a69b2..0000000
--- a/atril_0001-epub-Avoid-crash-when-index-list-has-extraneous-entr-1.26.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d901a9df71935fc98c0ec59bd27658670f3740ee Mon Sep 17 00:00:00 2001
-From: correctmost <134317971+correctmost@users.noreply.github.com>
-Date: Mon, 8 Jan 2024 18:08:38 -0500
-Subject: [PATCH 1/2] epub: Avoid crash when index list has extraneous entry
-
-This commit also fixes an incorrect sizeof call detected by
-AddressSanitizer.
-
-Closes #599
----
- backend/epub/epub-document.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c
-index 3ea7bdaa..1ac13e60 100644
---- a/backend/epub/epub-document.c
-+++ b/backend/epub/epub-document.c
-@@ -1044,7 +1044,7 @@ setup_document_content_list(const gchar* content_uri, GError** error,gchar *docu
- }
- if ( xmlStrcmp(itemrefptr->name,(xmlChar*)"itemref") == 0)
- {
-- contentListNode *newnode = g_malloc0(sizeof(newnode));
-+ contentListNode *newnode = g_malloc0(sizeof(*newnode));
- newnode->key = (gchar*)xml_get_data_from_node(itemrefptr,XML_ATTRIBUTE,(xmlChar*)"idref");
- if ( newnode->key == NULL )
- {
-@@ -1626,7 +1626,7 @@ page_set_function(linknode *Link, GList *contentList)
- contentListNode *pagedata;
-
- guint flag=0;
-- while (!flag) {
-+ while (!flag && listiter) {
- pagedata = listiter->data;
- if (link_present_on_page(Link->pagelink, pagedata->value)) {
- flag=1;
---
-2.43.0
-
diff --git a/atril_0001-epub-add-NULL-guards-to-prevent-crashes-with-malform.patch b/atril_0001-epub-add-NULL-guards-to-prevent-crashes-with-malform.patch
new file mode 100644
index 0000000..24936bb
--- /dev/null
+++ b/atril_0001-epub-add-NULL-guards-to-prevent-crashes-with-malform.patch
@@ -0,0 +1,59 @@
+From 9230de5a705068411d9ad4ffdba9b5e2d073ac35 Mon Sep 17 00:00:00 2001
+From: Victor Kareh <vkareh@redhat.com>
+Date: Fri, 5 Jun 2026 09:55:53 -0400
+Subject: [PATCH] epub: add NULL guards to prevent crashes with malformed EPUBs
+
+EPUB files with missing or incomplete metadata (like no title or missing
+navigation elements) can cause NULL pointer dereferences in the XML
+parsing functions. This adds NULL checks to xml_parse_children_of_node,
+get_child_list, and the TOC text parsing loop.
+
+Fixes #707
+---
+ backend/epub/epub-document.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c
+index 91e33faa..10b13d91 100644
+--- a/backend/epub/epub-document.c
++++ b/backend/epub/epub-document.c
+@@ -549,6 +549,9 @@ xml_parse_children_of_node(xmlNodePtr parent,
+ xmlChar* attributename,
+ xmlChar* attributevalue )
+ {
++ if ( parent == NULL )
++ return;
++
+ xmlNodePtr child = parent->xmlChildrenNode ;
+
+ while ( child != NULL )
+@@ -612,6 +615,8 @@ xml_get_data_from_node(xmlNodePtr node,
+ xmlChar* attributename)
+ {
+ xmlChar* datastring ;
++ if ( node == NULL )
++ return NULL;
+ if ( rettype == XML_ATTRIBUTE )
+ datastring= xmlGetProp(node,attributename);
+ else
+@@ -1178,6 +1183,8 @@ static GList*
+ get_child_list(xmlNodePtr ol,gchar* documentdir)
+ {
+ GList *childlist = NULL;
++ if (ol == NULL)
++ return NULL;
+ xmlNodePtr li = ol->xmlChildrenNode;
+
+ while (li != NULL) {
+@@ -1302,7 +1309,7 @@ setup_document_index(EpubDocument *epub_document,gchar *containeruri)
+ xml_parse_children_of_node(navLabel,(xmlChar*)"text",NULL,NULL);
+ linknode *newnode = g_new0(linknode,1);
+ newnode->linktext = NULL;
+- while (newnode->linktext == NULL) {
++ while (newnode->linktext == NULL && xmlretval != NULL) {
+ newnode->linktext = (gchar*)xml_get_data_from_node(xmlretval,XML_KEYWORD,NULL);
+ xmlretval = xmlretval->next;
+ }
+--
+2.54.0
+
diff --git a/atril_0002-fix-a-incompatible-pointer-type-warning-for-gcc14-1.26.patch b/atril_0002-fix-a-incompatible-pointer-type-warning-for-gcc14-1.26.patch
deleted file mode 100644
index 31691a8..0000000
--- a/atril_0002-fix-a-incompatible-pointer-type-warning-for-gcc14-1.26.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 479e927d957f7b66fbfe12ad2324f927be15182a Mon Sep 17 00:00:00 2001
-From: raveit65 <mate@raveit.de>
-Date: Wed, 31 Jan 2024 11:47:29 +0100
-Subject: [PATCH 2/2] fix a incompatible pointer type warning for gcc14
-
-* fix a incompatible pointer type warning for gcc14
-
-Co-authored-by: Colomban Wendling <cwendling@hypra.fr>
----
- backend/epub/epub-document.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c
-index 1ac13e60..471d9803 100644
---- a/backend/epub/epub-document.c
-+++ b/backend/epub/epub-document.c
-@@ -632,7 +632,7 @@ check_mime_type(const gchar* uri,GError** error)
- const gchar* mimetypes[] = {"application/epub+zip", "application/x-booki+zip", NULL};
- guint i;
-
-- for (i = 0; i < g_strv_length (mimetypes); i++) {
-+ for (i = 0; mimetypes[i]; i++) {
- if (strcmp(mimeFromFile, mimetypes[i]) == 0)
- return TRUE;
- }
-@@ -643,7 +643,7 @@ check_mime_type(const gchar* uri,GError** error)
- mimeFromFile = ev_file_get_mime_type (uri, TRUE, &err);
- if (mimeFromFile)
- {
-- for (i = 0; i < g_strv_length (mimetypes); i++) {
-+ for (i = 0; i < G_N_ELEMENTS (mimetypes); i++) {
- if (g_strcmp0(mimeFromFile, mimetypes[i]) == 0)
- return TRUE;
- }
---
-2.43.0
-
diff --git a/sources b/sources
index 2fdf242..3755b22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (atril-1.28.5.tar.xz) = 8c576a07564c48b90fb740e5b4a0d61b14ad70ede567b5eb2a0acccb62211cd296ed6b6c2322d231a27ce41ad8aa6c9c7a7320abd7f9afbae6665eefe3eeca6b
+SHA512 (atril-1.28.6.tar.xz) = 0f135c525314b7696df67f46d08a4c12c28e3cf37be52789b8c8e954d082c51b0dde7a9393efaef8c51b8f192cb251e702f7b9287d9ce1ad8a22c7807c259c02
reply other threads:[~2026-06-06 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178078118682.1.11514736311561700514.rpms-atril-d4b21f6b6446@fedoraproject.org \
--to=raveit65.sun@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox