Attachment 80115 Details for Bug 60853 – Fix dbus-deamon crash due to invalid service file

[patch] Fix dbus-deamon crash due to invalid service file

0001-Fix-dbus-daemon-crash-due-to-invalid-service-file.patch (text/plain), 1.31 KB, created by Chengwei Yang on 2013-06-01 09:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-06-01 09:54:31 UTC

Size: 1.31 KB

patch

obsolete

>From 7c95d7d9305c72484ad280def081edbfcdbc1262 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Sat, 1 Jun 2013 17:52:00 +0800
>Subject: [PATCH] Fix dbus-daemon crash due to invalid service file
>
>dbus-daemon will crash due to invalid service file which key/value
>starts before section. In that situation, new_line() will try to access
>invalid address.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60853
>
>Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
>---
> bus/desktop-file.c |    5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/bus/desktop-file.c b/bus/desktop-file.c
>index ae441c5..6f585a5 100644
>--- a/bus/desktop-file.c
>+++ b/bus/desktop-file.c
>@@ -322,6 +322,9 @@ new_line (BusDesktopFileParser *parser)
>   BusDesktopFileSection *section;
>   BusDesktopFileLine *line;
>   
>+  if (parser == NULL || parser->current_section < 0)
>+    return NULL;
>+
>   section = &parser->desktop_file->sections[parser->current_section];
> 
>   if (section->n_allocated_lines == section->n_lines)
>@@ -690,7 +693,7 @@ bus_desktop_file_load (DBusString *filename,
> 	parse_comment_or_blank (&parser);
>       else
> 	{
>-	  if (!parse_key_value (&parser, error))
>+	  if (parser.current_section == -1 || !parse_key_value (&parser, error))
>             {
>               return NULL;
>             }
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 60853: 80115 | 80380

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.