From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] tig: add segfault patch
Date: Sat, 04 Jan 2020 06:25:37 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18023@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages tig
https://github.com/void-linux/void-packages/pull/18023
tig: add segfault patch
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/18023.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tig-18023.patch --]
[-- Type: text/x-diff, Size: 1936 bytes --]
From 89a76519e1abfec9a5b82af1a4fba306c54d4898 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Fri, 3 Jan 2020 23:18:56 -0600
Subject: [PATCH] tig: add segfault patch
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/tig/patches/fix-segfault.patch | 29 ++++++++++++++++++++++++++
srcpkgs/tig/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/tig/patches/fix-segfault.patch
diff --git a/srcpkgs/tig/patches/fix-segfault.patch b/srcpkgs/tig/patches/fix-segfault.patch
new file mode 100644
index 00000000000..1122e9ff4d0
--- /dev/null
+++ b/srcpkgs/tig/patches/fix-segfault.patch
@@ -0,0 +1,29 @@
+From 6202c6032f17438a2facb23f02e330b9d0566d9d Mon Sep 17 00:00:00 2001
+From: Thomas Koutcher <thomas.koutcher@online.fr>
+Date: Sun, 24 Nov 2019 13:06:08 +0100
+Subject: [PATCH] Fix segmentation fault
+
+As reported by Maxim Zhukov, the commit 9ca7710 ("Fix memory leak in
+main view (#931)", 01-06-2019) causes a SIGSEGV when holding the key
+'Stage/Unstage current line' in stage view.
+
+Add a check to avoid null pointer dereference.
+
+Fixes #971
+---
+ src/graph-v2.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/graph-v2.c b/src/graph-v2.c
+index 46504a85..69ac1587 100644
+--- src/graph-v2.c
++++ src/graph-v2.c
+@@ -257,6 +257,7 @@ done_graph(struct graph *graph_ref)
+ {
+ struct graph_v2 *graph = graph_ref->private;
+
+- htab_delete(graph->colors.id_map);
++ if (graph->colors.id_map)
++ htab_delete(graph->colors.id_map);
+
+ free(graph);
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index de3ef8ba17c..c875540b1a9 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -1,7 +1,7 @@
# Template file for 'tig'
pkgname=tig
version=2.5.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
make_install_args="install-doc-man"
next reply other threads:[~2020-01-04 5:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 5:25 voidlinux-github [this message]
2020-01-04 7:20 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-04 8:09 ` [PR PATCH] [Merged]: " voidlinux-github
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18023@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--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).