Attachment 3473 Details for Bug 19701 – Исправление

[patch] Исправление

dbus.112803.debdiff (text/plain), 1.71 KB, created by Lenar Shakirov on 2009-04-21 10:15:48 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Lenar Shakirov

Created: 2009-04-21 10:15:48 MSD

Size: 1.71 KB

patch

obsolete

>diff -u dbus-1.0.2/debian/changelog dbus-1.0.2/debian/changelog
>--- dbus-1.0.2/debian/changelog
>+++ dbus-1.0.2/debian/changelog
>@@ -1,3 +1,15 @@
>+dbus (1.0.2-1ubuntu4) feisty-proposed; urgency=low
>+
>+  * Add debian/patches/02_dbus-launch_close_pipe.patch:
>+    - _dbus_get_autolaunch_address(): When calling dbus-launch fails,
>+       close the reading end of the pipe.
>+    - This caused a serious fd leak in programs like cups when they repeatedly
>+      try to send dbus messages, dbus is not running, and dbus-launch is not
>+      available or otherwise fails to execute.
>+    - LP: #112803
>+
>+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 26 Jul 2007 11:08:35 +0200
>+
> dbus (1.0.2-1ubuntu3) feisty; urgency=low
> 
>   * debian/rules: Start dbus at runlevel priority 12, so that it comes before
>only in patch2:
>unchanged:
>--- dbus-1.0.2.orig/debian/patches/02_dbus-launch_close_pipe.patch
>+++ dbus-1.0.2/debian/patches/02_dbus-launch_close_pipe.patch
>@@ -0,0 +1,20 @@
>+diff -Nur dbus-1.0.2/dbus/dbus-sysdeps-unix.c dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c
>+--- dbus-1.0.2/dbus/dbus-sysdeps-unix.c	2006-12-11 20:21:09.000000000 +0100
>++++ dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c	2007-07-26 11:07:45.000000000 +0200
>+@@ -2426,6 +2426,8 @@
>+                       _dbus_strerror (errno));
>+       _dbus_verbose ("Failed to fork() to call dbus-launch: %s\n",
>+                      _dbus_strerror (errno));
>++      close(address_pipe[READ_END]);
>++      close(address_pipe[WRITE_END]);
>+       goto out;
>+     }
>+ 
>+@@ -2477,6 +2479,7 @@
>+       ret = waitpid (pid, &status, 0);
>+     }
>+   while (ret == -1 && errno == EINTR);
>++  close (address_pipe[READ_END]);
>+ 
>+   /* We succeeded if the process exited with status 0 and
>+      anything was read */

Actions: View | Diff

Attachments on bug 19701: 3473