[PR PATCH] tig: add segfault patch

[PR PATCH] tig: add segfault patch

[voidlinux-github]

[-- 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"

Re: [PR PATCH] [Updated] tig: add segfault patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

There is an updated 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 3f3e91cfca6352f01cd2fcfe6322b55d9c53227c 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"

Re: [PR PATCH] [Merged]: tig: add segfault patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

There's a merged pull request on the void-packages repository

tig: add segfault patch
https://github.com/void-linux/void-packages/pull/18023

Description:
Signed-off-by: Nathan Owens <ndowens04@gmail.com>