Bug#251842: hotkeys: diff for NMU version 0.5.7.4-0.3

[Sandro Tosi]

tags 251842 + patch
thanks

Dear maintainer,

I've prepared an NMU for hotkeys (versioned as 0.5.7.4-0.3) and
uploaded it to unstable.

Regards.

diff -Nru hotkeys-0.5.7.4/ChangeLog hotkeys-0.5.7.4/ChangeLog
--- hotkeys-0.5.7.4/ChangeLog	2009-04-23 03:33:10.000000000 +0200
+++ hotkeys-0.5.7.4/ChangeLog	2009-05-24 21:14:37.000000000 +0200
@@ -1,3 +1,12 @@
+hotkeys (0.5.7.4-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * properly check for NULL pointers returned when configuring ALSA; thanks to
+    Ico Doornekamp for the patch; Closes: #251842 (severity=grave,
+    urgency=medium)
+
+ -- Sandro Tosi <mo...@debian.org>  Sun, 24 May 2009 21:14:34 +0200
+
 hotkeys (0.5.7.4-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru hotkeys-0.5.7.4/debian/changelog hotkeys-0.5.7.4/debian/changelog
--- hotkeys-0.5.7.4/debian/changelog	2009-04-23 03:33:10.000000000 +0200
+++ hotkeys-0.5.7.4/debian/changelog	2009-05-24 21:14:37.000000000 +0200
@@ -1,3 +1,12 @@
+hotkeys (0.5.7.4-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * properly check for NULL pointers returned when configuring ALSA; thanks to
+    Ico Doornekamp for the patch; Closes: #251842 (severity=grave,
+    urgency=medium)
+
+ -- Sandro Tosi <mo...@debian.org>  Sun, 24 May 2009 21:14:34 +0200
+
 hotkeys (0.5.7.4-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru hotkeys-0.5.7.4/src/hotkeys.c hotkeys-0.5.7.4/src/hotkeys.c
--- hotkeys-0.5.7.4/src/hotkeys.c	2009-04-23 02:52:05.000000000 +0200
+++ hotkeys-0.5.7.4/src/hotkeys.c	2009-05-24 20:56:12.000000000 +0200
@@ -1566,6 +1566,7 @@
 main(int argc, char *argv[])
 {
     XkbEvent    ev;
+    char *alsacard, *alsacontrols;
 
     errorFile = stderr;
     openlog( PACKAGE, LOG_CONS | LOG_PID, LOG_USER );
@@ -1579,8 +1580,11 @@
     if ( !parseArgs(argc,argv) )
         bailout();
 
-    if ( configALSA(strdup(getConfig("ALSAcard")), strdup(getConfig("ALSAcontrols"))) == 0)
+    alsacard = getConfig("ALSAcard");
+    alsacontrols = getConfig("ALSAcontrols");
+    if(alsacard && alsacontrols && configALSA(alsacard, alsacontrols) == 0) {
 	    haveALSA = True;
+    }
 
 #if HAVE_GTK
     if ( !noSplash )