Attachment 129095 Details for Bug 3603 – Updated patch with proper indentation.

[patch] Updated patch with proper indentation.

0001-Fix-crash-when-encountering-cursor-themes-with-circu.patch (text/plain), 1.08 KB, created by Philipp Ludwig on 2017-01-22 13:24:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Ludwig

Created: 2017-01-22 13:24:52 UTC

Size: 1.08 KB

patch

obsolete

>From 9abd6f741b6a4d5ec5fc65cce7ecd16e7d4c5c72 Mon Sep 17 00:00:00 2001
>From: Philipp Ludwig <git-devel@philippludwig.net>
>Date: Sun, 22 Jan 2017 14:21:54 +0100
>Subject: [PATCH] Fix crash when encountering cursor themes with circular
> dependencies.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=3603
>Signed-off-by: Philipp Ludwig <git-devel@philippludwig.net>
>---
> src/library.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/src/library.c b/src/library.c
>index fd040ce..ba66ca5 100644
>--- a/src/library.c
>+++ b/src/library.c
>@@ -259,8 +259,10 @@ XcursorScanTheme (const char *theme, const char *name)
>     /*
>      * Recurse to scan inherited themes
>      */
>-    for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
>-	f = XcursorScanTheme (i, name);
>+    for (i = inherits; i && f == NULL; i = _XcursorNextPath (i)) {
>+        if(strcmp(i, theme) != 0) f = XcursorScanTheme (i, name);
>+        else printf("Not calling XcursorScanTheme because of circular dependency: %s. %s", i, name);
>+    }
>     if (inherits != NULL)
> 	free (inherits);
>     return f;
>-- 
>2.10.2
>

Actions: View | Splinter Review

Attachments on bug 3603: 129094 | 129095

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.