diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2020-01-18 22:05:53 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2020-01-18 22:05:53 +0000 |
| commit | 94a81d37c3b0682d3915bdc15f1b70976d8dbaae (patch) | |
| tree | 249c381394ad2f2311144fbaecc068d84d7da217 | |
| parent | 1f932b0a38e7a4bce8aead1d12e1335a33b4322e (diff) | |
| download | pkgsrc-94a81d37c3b0682d3915bdc15f1b70976d8dbaae.tar.gz | |
Pullup ticket #6106 - requested by gutteridge
x11/mate-terminal: crash fix
Revisions pulled up:
- x11/mate-terminal/Makefile 1.19
- x11/mate-terminal/distinfo 1.7
- x11/mate-terminal/patches/patch-src_terminal-screen.c 1.1
---
Module Name: pkgsrc
Committed By: gutteridge
Date: Thu Jan 2 18:55:58 UTC 2020
Modified Files:
pkgsrc/x11/mate-terminal: Makefile distinfo
Added Files:
pkgsrc/x11/mate-terminal/patches: patch-src_terminal-screen.c
Log Message:
mate-terminal: avoid NULL pointer dereference
This fixes a bug that caused significant application crashes.
| -rw-r--r-- | x11/mate-terminal/Makefile | 4 | ||||
| -rw-r--r-- | x11/mate-terminal/distinfo | 3 | ||||
| -rw-r--r-- | x11/mate-terminal/patches/patch-src_terminal-screen.c | 17 |
3 files changed, 21 insertions, 3 deletions
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile index 427e2f88ccf..e538c337fba 100644 --- a/x11/mate-terminal/Makefile +++ b/x11/mate-terminal/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2019/07/21 22:26:02 wiz Exp $ +# $NetBSD: Makefile,v 1.18.6.1 2020/01/18 22:05:53 bsiegert Exp $ -PKGREVISION= 2 +PKGREVISION= 3 .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= mate-terminal-${VERSION:R}.1 diff --git a/x11/mate-terminal/distinfo b/x11/mate-terminal/distinfo index 8df4da0832e..1716143a2a4 100644 --- a/x11/mate-terminal/distinfo +++ b/x11/mate-terminal/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2019/05/08 01:40:01 gutteridge Exp $ +$NetBSD: distinfo,v 1.6.8.1 2020/01/18 22:05:53 bsiegert Exp $ SHA1 (mate-terminal-1.22.1.tar.xz) = 52218ea2066fb813c351b6e1b8b22787665d177a RMD160 (mate-terminal-1.22.1.tar.xz) = 907928524c180129af4bda7ec0e14260627e3ea9 SHA512 (mate-terminal-1.22.1.tar.xz) = b20102c15dc140b59c93802606ca94fd108dfd5f7ac7f079b872e957794fc2c3aab40c0e6da697e8d393a67fca7b106573a4cb8014af5d6c8ad777be3a798534 Size (mate-terminal-1.22.1.tar.xz) = 1543900 bytes +SHA1 (patch-src_terminal-screen.c) = 2fbfe4ef4280174b6688fbc37e13bc839dd175f7 diff --git a/x11/mate-terminal/patches/patch-src_terminal-screen.c b/x11/mate-terminal/patches/patch-src_terminal-screen.c new file mode 100644 index 00000000000..56dd55db35b --- /dev/null +++ b/x11/mate-terminal/patches/patch-src_terminal-screen.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_terminal-screen.c,v 1.1.2.2 2020/01/18 22:05:53 bsiegert Exp $ + +Avoid NULL pointer dereference in terminal_screen_child_exited. +https://github.com/mate-desktop/mate-terminal/commit/fe73da93aa0a14ee471e7a6af7914197c41d3723 + +--- src/terminal-screen.c.orig 2019-04-23 10:25:08.000000000 +0000 ++++ src/terminal-screen.c +@@ -1946,6 +1946,9 @@ terminal_screen_child_exited (VteTermina + break; + case TERMINAL_EXIT_HOLD: + { ++ if ((status == 9) && (priv->override_command == NULL)) ++ break; ++ + GtkWidget *info_bar; + + info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO, |