Attachment 42762 Details for Bug 19186 – If a file included via <includedir/> is invalid, syslog and skip it

[patch] If a file included via <includedir/> is invalid, syslog and skip it

0001-If-a-file-included-via-includedir-is-invalid-syslog-.patch (text/plain), 2.02 KB, created by Simon McVittie on 2011-01-31 10:13:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-31 10:13:59 UTC

Size: 2.02 KB

patch

obsolete

>From 468f9a3db7b1b6586722c46fabf52540428364cb Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 31 Jan 2011 18:06:09 +0000
>Subject: [PATCH] If a file included via <includedir/> is invalid, syslog and skip it
>
>This is more graceful than failing entirely (our previous behaviour),
>but more visible than ignoring it completely (the previous behaviour
>patched in by Debian and derivatives).
>
>Based on a patch from Daniel Silverstone back in 2004, which was meant
>to be temporary; I think it makes sense to change this permanently,
>since files in *.d are typically supplied by other packages, whose bugs
>shouldn't be able to bring down dbus-daemon.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19186
>Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=230231
>---
> bus/config-parser.c |   15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/bus/config-parser.c b/bus/config-parser.c
>index f128b91..dd941e3 100644
>--- a/bus/config-parser.c
>+++ b/bus/config-parser.c
>@@ -2237,8 +2237,19 @@ include_dir (BusConfigParser   *parser,
>         {
>           if (!include_file (parser, &full_path, TRUE, error))
>             {
>-              _dbus_string_free (&full_path);
>-              goto failed;
>+              if (dbus_error_is_set (error))
>+                {
>+                  /* We log to syslog unconditionally here, because this is
>+                   * the configuration parser, so we don't yet know whether
>+                   * this bus is going to want to write to syslog! (There's
>+                   * also some layer inversion going on, if we want to use
>+                   * the bus context.) */
>+                  _dbus_system_log (DBUS_SYSTEM_LOG_INFO,
>+                                    "Encountered error '%s' while parsing '%s'\n",
>+                                    error->message,
>+                                    _dbus_string_get_const_data (&full_path));
>+                  dbus_error_free (error);
>+                }
>             }
>         }
> 
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 19186: 41714 | 42762

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.