CVS commit: pkgsrc/emulators/retroarch

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 18 12:27:47 UTC 2019

Modified Files:
        pkgsrc/emulators/retroarch: Makefile distinfo
        pkgsrc/emulators/retroarch/patches:
            patch-frontend_drivers_platform__unix.c

Log Message:
retroarch: Fix a null pointer deref on initial startup.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/retroarch/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/retroarch/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/retroarch/Makefile
diff -u pkgsrc/emulators/retroarch/Makefile:1.21 pkgsrc/emulators/retroarch/Makefile:1.22
--- pkgsrc/emulators/retroarch/Makefile:1.21    Sat May 11 11:56:33 2019
+++ pkgsrc/emulators/retroarch/Makefile Sat May 18 12:27:47 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2019/05/11 11:56:33 nia Exp $
+# $NetBSD: Makefile,v 1.22 2019/05/18 12:27:47 nia Exp $
 
 PKGNAME=       retroarch-${RETROARCH_VERSION}
 DISTNAME=      RetroArch-${RETROARCH_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/retroarch/distinfo
diff -u pkgsrc/emulators/retroarch/distinfo:1.12 pkgsrc/emulators/retroarch/distinfo:1.13
--- pkgsrc/emulators/retroarch/distinfo:1.12    Sat May 11 11:56:33 2019
+++ pkgsrc/emulators/retroarch/distinfo Sat May 18 12:27:47 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/05/11 11:56:33 nia Exp $
+$NetBSD: distinfo,v 1.13 2019/05/18 12:27:47 nia Exp $
 
 SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19
 RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81
@@ -7,5 +7,5 @@ Size (RetroArch-1.7.7.tar.xz) = 22078781
 SHA1 (patch-Makefile) = a4dd20cf34724f79e4cc886c5d7a383a11d2e42d
 SHA1 (patch-audio_drivers_audioio.c) = 50820a7f3fbf7685098efdb794dd4efa485df806
 SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239
-SHA1 (patch-frontend_drivers_platform__unix.c) = b3e2b8ccf19d72c1c561bbbc1913996e12d88aeb
+SHA1 (patch-frontend_drivers_platform__unix.c) = e81ba53af2bdd4cecc4007cc9556f06446bf3b3f
 SHA1 (patch-qb_config.libs.sh) = 0ec6ab7d49cdcd59c5938276517df1ee0212868e

Index: pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c
diff -u pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c:1.3 pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c:1.4
--- pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c:1.3      Wed May  8 12:40:05 2019
+++ pkgsrc/emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c  Sat May 18 12:27:47 2019
@@ -1,7 +1,9 @@
-$NetBSD: patch-frontend_drivers_platform__unix.c,v 1.3 2019/05/08 12:40:05 nia Exp $
+$NetBSD: patch-frontend_drivers_platform__unix.c,v 1.4 2019/05/18 12:27:47 nia Exp $
 
 Pick up paths from pkgsrc.
 
+Avoid dereferencing a null pointer returned from getenv (see pull/8805).
+
 --- frontend/drivers/platform_unix.c.orig      2019-05-08 06:06:23.000000000 +0000
 +++ frontend/drivers/platform_unix.c
 @@ -1868,32 +1868,15 @@ static void frontend_unix_get_env(int *a
@@ -58,3 +60,14 @@ Pick up paths from pkgsrc.
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
           "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path,
+@@ -2523,7 +2506,9 @@ enum retro_language frontend_unix_get_us
+       }
+    }
+ #else
+-   lang = rarch_get_language_from_iso(getenv("LANG"));
++   char *envvar = getenv("LANG");
++   if (envvar)
++      lang = rarch_get_language_from_iso(getenv("LANG"));
+ #endif
+ #endif
+    return lang;