From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zathura: backport (improved) upstream patch for buffer overflow
Date: Fri, 16 Jul 2021 10:17:40 +0200 [thread overview]
Message-ID: <20210716081740.CMBRQYzDCQ3hKxaqeyB0Dw5AcFtHL-bXF_7ORMNfWgY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31989@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages zatmin
https://github.com/void-linux/void-packages/pull/31989
zathura: backport (improved) upstream patch for buffer overflow
Tested on x86_64-musl, fixes #31722
A patch file from https://github.com/void-linux/void-packages/pull/31989.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zatmin-31989.patch --]
[-- Type: text/x-diff, Size: 2747 bytes --]
From 619b40fd479dc4a30bb60df939307d1fb0ea17a3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 15 Jul 2021 23:41:30 +0200
Subject: [PATCH] zathura: backport (improved) upstream patch for buffer
overflow
---
.../zathura/patches/fix-buffer-overflow.patch | 31 +++++++++++++++++--
srcpkgs/zathura/template | 2 +-
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zathura/patches/fix-buffer-overflow.patch b/srcpkgs/zathura/patches/fix-buffer-overflow.patch
index f11b343b1845..908b06b87c6f 100644
--- a/srcpkgs/zathura/patches/fix-buffer-overflow.patch
+++ b/srcpkgs/zathura/patches/fix-buffer-overflow.patch
@@ -1,5 +1,9 @@
+Taken from upstream
+https://git.pwmt.org/pwmt/zathura/-/commit/2713de2f6c810f5f0be3c179944867b5b07ddaed
+with a small correction
+
diff --git a/zathura/utils.c b/zathura/utils.c
-index b4b058f..6e1910e 100644
+index b4b058f..35abd6b 100644
--- a/zathura/utils.c
+++ b/zathura/utils.c
@@ -401,7 +401,7 @@ rectangle_to_points(void* vrect, void* vlist) {
@@ -7,7 +11,30 @@ index b4b058f..6e1910e 100644
static void
append_unique_uint(girara_list_t* list, const unsigned int v) {
- double* p = g_try_malloc(sizeof(v));
-+ double* p = g_try_malloc(sizeof(*p));
++ unsigned int* p = g_try_malloc(sizeof *p);
if (p == NULL) {
return;
}
+@@ -433,16 +433,16 @@ cut_rectangle(const zathura_rectangle_t* rect, girara_list_t* points, girara_lis
+ GIRARA_LIST_FOREACH_END(points, zathura_point_t*, i_pt, pt);
+
+ double x = ufloor(rect->x1);
+- GIRARA_LIST_FOREACH(xs, const double*, ix, cx)
++ GIRARA_LIST_FOREACH(xs, const unsigned int*, ix, cx)
+ double y = ufloor(rect->y1);
+- GIRARA_LIST_FOREACH(ys, const double*, iy, cy)
++ GIRARA_LIST_FOREACH(ys, const unsigned int*, iy, cy)
+ zathura_rectangle_t* r = g_try_malloc(sizeof(zathura_rectangle_t));
+ *r = (zathura_rectangle_t) {x, y, *cx, *cy};
+ y = *cy;
+ girara_list_append_unique(rectangles, cmp_rectangle, r);
+- GIRARA_LIST_FOREACH_END(ys, const double*, iy, cy);
++ GIRARA_LIST_FOREACH_END(ys, const unsigned int*, iy, cy);
+ x = *cx;
+- GIRARA_LIST_FOREACH_END(xs, const double*, ix, cx);
++ GIRARA_LIST_FOREACH_END(xs, const unsigned int*, ix, cx);
+
+ girara_list_free(xs);
+ girara_list_free(ys);
+--
+2.26.2
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 5495c235fd99..54e869f539d0 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
# Template file for 'zathura'
pkgname=zathura
version=0.4.7
-revision=3
+revision=4
build_style=meson
configure_args="-Dsynctex=enabled"
hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
next prev parent reply other threads:[~2021-07-16 8:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 21:45 [PR PATCH] " dkwo
2021-07-15 21:56 ` ericonr
2021-07-15 21:56 ` ericonr
2021-07-16 8:17 ` dkwo [this message]
2021-07-16 8:19 ` dkwo
2021-07-16 20:25 ` [PR PATCH] [Merged]: " ericonr
2021-07-16 20:25 ` ericonr
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=20210716081740.CMBRQYzDCQ3hKxaqeyB0Dw5AcFtHL-bXF_7ORMNfWgY@z \
--to=dkwo@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).