[Pkg-utopia-commits] r1024 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-17 17:45:59 +0000 (Sun, 17 Sep 2006)
New Revision: 1024

Added:
   packages/unstable/hal/debian/patches/04_runner_return_overflow.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/04_runner_return_overflow.patch
  - Added. Don't try to push a 64 bit value in 32 bit. Fixes a crash when a
    probe/addon failes. (From upstream git)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-09-17 16:16:04 UTC (rev 1023)
+++ packages/unstable/hal/debian/changelog	2006-09-17 17:45:59 UTC (rev 1024)
@@ -38,9 +38,11 @@
     for the definition of ARPHRD_IEEE80211_RADIOTAP
   * debian/hal.install: Scripts are no longer in /usr/share/hal but in
     /usr/lib/hal
-    
+  * debian/patches/04_runner_return_overflow.patch
+    - Added. Don't try to push a 64 bit value in 32 bit. Fixes a crash when a
+      probe/addon failes. (From upstream git)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 17 Sep 2006 17:21:30 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 17 Sep 2006 19:35:31 +0200
 
 hal (0.5.7.1-2) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/04_runner_return_overflow.patch
===================================================================
--- packages/unstable/hal/debian/patches/04_runner_return_overflow.patch	                        (rev 0)
+++ packages/unstable/hal/debian/patches/04_runner_return_overflow.patch	2006-09-17 17:45:59 UTC (rev 1024)
@@ -0,0 +1,37 @@
+commit 482a82f7f06303467b86f18cc9db793514660a78
+Author: David Zeuthen <davidz at redhat.com>
+Date:   Wed Sep 13 20:04:52 2006 -0400
+
+    fix up overflow of 32-bit variable when getting 64-bit value
+
+diff --git a/hald/hald_runner.c b/hald/hald_runner.c
+index 4fa7b44..0d80683 100644
+--- a/hald/hald_runner.c
++++ b/hald/hald_runner.c
+@@ -104,20 +104,21 @@ runner_server_message_handler (DBusConne
+ 		   dbus_message_get_path (message), 
+ 		   dbus_message_get_interface (message),
+ 		   dbus_message_get_member (message)));*/
+-
+ 	if (dbus_message_is_signal (message, 
+ 				    "org.freedesktop.HalRunner", 
+ 				    "StartedProcessExited")) {
+-		GPid pid;
++		dbus_uint64_t dpid;
+ 		DBusError error;
+ 		dbus_error_init (&error);
+ 		if (dbus_message_get_args (message, &error,
+-				   DBUS_TYPE_INT64, &pid,
+-				   DBUS_TYPE_INVALID)) {
++					   DBUS_TYPE_INT64, &dpid,
++					   DBUS_TYPE_INVALID)) {
+ 			RunningProcess *rp;
++			GPid pid;
+ 
+-			/*HAL_INFO (("Previously started process with pid %d exited", pid));*/
++			pid = (GPid) dpid;
+ 
++			/*HAL_INFO (("Previously started process with pid %d exited", pid));*/
+ 			rp = g_hash_table_lookup (running_processes, (gpointer) pid);
+ 			if (rp != NULL) {
+ 				rp->cb (rp->device, 0, 0, NULL, rp->data1, rp->data2);