summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2008-01-15 15:57:34 -0500
committerJohn (J5) Palmieri <johnp@redhat.com>2008-01-15 15:57:34 -0500
commit738743002dc72b69cf440d5a4be30e2fedf51892 (patch)
tree588a9df6a5e76c1fa63f366e2b8ffe56953c29e6
parent4cc2bfa10e1a840e0da34a588f719779cc284a79 (diff)
don't check for < 0 on an unsigned variable (FDO Bug #12924)
2008-01-15 John (J5) Palmieri <johnp@redhat.com> * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> * dbus/dbus-connection.c (_dbus_connection_get_next_client_serial): don't check for < 0 on an unsigned variable (FDO Bug #12924)
-rw-r--r--ChangeLog7
-rw-r--r--dbus/dbus-connection.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 45471768..abc9be21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
+
+ * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+ * dbus/dbus-connection.c (_dbus_connection_get_next_client_serial):
+ don't check for < 0 on an unsigned variable (FDO Bug #12924)
+
+2008-01-15 John (J5) Palmieri <johnp@redhat.com>
* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 54f0a920..66f85263 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -1378,13 +1378,13 @@ _dbus_connection_unref_unlocked (DBusConnection *connection)
static dbus_uint32_t
_dbus_connection_get_next_client_serial (DBusConnection *connection)
{
- int serial;
+ dbus_uint32_t serial;
serial = connection->client_serial++;
- if (connection->client_serial < 0)
+ if (connection->client_serial == 0)
connection->client_serial = 1;
-
+
return serial;
}