[maemo-commits] [maemo-commits] r14619 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-25 16:37:35 +0300 (Thu, 25 Oct 2007)
New Revision: 14619

Added:
   projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch
Log:
fix to the patch to handle variable overflow


Added: projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch	2007-10-25 12:56:11 UTC (rev 14618)
+++ projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch	2007-10-25 13:37:35 UTC (rev 14619)
@@ -0,0 +1,21 @@
+diff -pur dbus-1.0.2/dbus/dbus-connection.c dbus-1.0.2.new/dbus/dbus-connection.c
+--- dbus-1.0.2/dbus/dbus-connection.c	2006-12-11 21:21:08.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-25 16:36:35.916915136 +0300
+@@ -1374,13 +1374,12 @@ _dbus_connection_unref_unlocked (DBusCon
+ static dbus_uint32_t
+ _dbus_connection_get_next_client_serial (DBusConnection *connection)
+ {
+-  int serial;
++  dbus_uint32_t serial;
+ 
+-  serial = connection->client_serial++;
++  serial = ++(connection->client_serial);
++  if (serial == 0)
++    serial = 1;
+ 
+-  if (connection->client_serial < 0)
+-    connection->client_serial = 1;
+-  
+   return serial;
+ }
+