Attachment 16270 Details for Bug 15776 – 0001-Fix-a-crash-if-xorg.conf-doesn-t-have-a-Files-sectio.patch

[patch] 0001-Fix-a-crash-if-xorg.conf-doesn-t-have-a-Files-sectio.patch

0001-Fix-a-crash-if-xorg.conf-doesn-t-have-a-Files-sectio.patch (text/plain), 1.21 KB, created by Paulo César Pereira de Andrade on 2008-04-30 14:29:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-04-30 14:29:19 UTC

Size: 1.21 KB

patch

obsolete

>From 23eb7aba6486087a9b9c8216d2c0b5cd667d515a Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Tue, 29 Apr 2008 16:59:21 -0300
>Subject: [PATCH] Fix a crash if xorg.conf doesn't have a Files section.
>
>The crash happens when opening the "Expert Mode" interface.
>---
> hw/xfree86/utils/xorgcfg/expert.c |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
>diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c
>index 5c22a6e..497e620 100644
>--- a/hw/xfree86/utils/xorgcfg/expert.c
>+++ b/hw/xfree86/utils/xorgcfg/expert.c
>@@ -460,11 +460,15 @@ PopdownCallback(Widget w, XtPointer user_data, XtPointer call_data)
> static void
> CreateFiles(TreeNode *files)
> {
>-    XF86ConfFilesPtr file = XF86Config->conf_files;
>+    XF86ConfFilesPtr file;
>     TreeNode *node, *fontpath, *modulepath;
>     Widget w;
>     char *value;
> 
>+    if (XF86Config->conf_files == NULL)
>+	XF86Config->conf_files = (XF86ConfFilesPtr)
>+	    XtCalloc(1, sizeof(XF86ConfFilesRec));
>+    file = XF86Config->conf_files;
>     value = file->file_logfile ? file->file_logfile : "";
>     node = NewNode(files, NULL, NULL, files->node, 
> 		   (TreeData*)XtCalloc(1, sizeof(TreeData)));
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 15776: 16270 | 16284

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.