[arch-commits] Commit in gkrellm/trunk (PKGBUILD fix-critical-warning.patch)

[Balló György]

    Date: Wednesday, January 24, 2018 @ 20:08:54
  Author: bgyorgy
Revision: 286688

upgpkg: gkrellm 2.3.10-3

Avoid calling g_strstr_len with NULL haystack (FS#51413)

Added:
  gkrellm/trunk/fix-critical-warning.patch
Modified:
  gkrellm/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   12 +++++++++++-
 fix-critical-warning.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-24 20:07:43 UTC (rev 286687)
+++ PKGBUILD	2018-01-24 20:08:54 UTC (rev 286688)
@@ -7,7 +7,7 @@
 
 pkgname=gkrellm
 pkgver=2.3.10
-pkgrel=2
+pkgrel=3
 pkgdesc="System monitor package for GTK2"
 arch=('x86_64')
 url="http://gkrellm.srcbox.net/"
@@ -16,10 +16,20 @@
 makedepends=('gettext')
 backup=('etc/gkrellmd.conf')
 source=("${url}/releases/${pkgname}-${pkgver}.tar.bz2"
+        "fix-critical-warning.patch"
         "gkrellm.service")
 sha256sums=('8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766'
+            '05c02428065b8774637db3efe564fb597e3d9d3d9200e004077fbe9a04412e36'
             '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Avoid calling g_strstr_len with NULL haystack (FS#51413)
+  # https://git.srcbox.net/gkrellm/commit/?id=3db76c647a04a603bafae19cc699bd50436d66a2
+  patch -Np1 -i ../fix-critical-warning.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: fix-critical-warning.patch
===================================================================
--- fix-critical-warning.patch	                        (rev 0)
+++ fix-critical-warning.patch	2018-01-24 20:08:54 UTC (rev 286688)
@@ -0,0 +1,35 @@
+From 3db76c647a04a603bafae19cc699bd50436d66a2 Mon Sep 17 00:00:00 2001
+From: Jindřich Makovička
+Date: Sat, 20 May 2017 10:34:52 +0200
+Subject: Avoid calling g_strstr_len with NULL haystack
+
+---
+ src/sysdeps/linux.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
+index 460a03d..99e7261 100644
+--- a/src/sysdeps/linux.c
++++ b/src/sysdeps/linux.c
+@@ -3157,6 +3157,7 @@ sensors_nvidia_smi_read(gboolean setup)
+ 				    || !strcmp(id, ":")
+ 				   )
+ 					continue;
++				stmp = str;
+ 				if ((str = g_strstr_len(str, -1, "Temperature")) != NULL)
+ 					{
+ 					str += 11;
+@@ -3185,6 +3186,10 @@ sensors_nvidia_smi_read(gboolean setup)
+ 					else if ((smi = nvidia_smi_lookup(id)) != NULL)
+ 						smi->temp = temp;
+ 					}
++				else
++					{
++					str = stmp;
++					}
+ 				}
+ 			}
+ 	if (output)
+-- 
+cgit v0.12
+