summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--dbus/dbus-spawn.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84faa733..d0020c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+ * dbus/dbus-spawn.c (read_ints, read_pid): use correct ssize_t type
+ instead of size_t (FDO Bug #12862)
+
+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-errors.c (dbus_set_error): make sure to call va_end if we
hit an OOM error inside va_start (FDO Bug #12846)
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 68596cf3..52d3eef0 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -73,7 +73,7 @@ read_ints (int fd,
while (TRUE)
{
size_t chunk;
- size_t to_read;
+ ssize_t to_read;
to_read = sizeof (int) * n_ints_in_buf - bytes;
@@ -128,7 +128,7 @@ read_pid (int fd,
while (TRUE)
{
size_t chunk;
- size_t to_read;
+ ssize_t to_read;
to_read = sizeof (pid_t) - bytes;