Attachment 15606 Details for Bug 15305 – patch for libX11-1.1.4/src/xcms/cmsColNm.c

[patch] patch for libX11-1.1.4/src/xcms/cmsColNm.c

x11.patch (text/plain), 971 bytes, created by walter on 2008-04-01 09:39:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: walter

Created: 2008-04-01 09:39:26 UTC

Size: 971 bytes

patch

obsolete

>--- src/xcms/cmsColNm.c.org     2008-03-31 18:53:39.000000000 +0200
>+++ src/xcms/cmsColNm.c 2008-03-31 18:53:46.000000000 +0200
>@@ -711,7 +711,7 @@
>     FILE *stream;
>     const char *pathname;
>     struct stat txt;
>-    int length;
>+    int length,ret;
> 
>     /* use and name of this env var is not part of the standard */
>     /* implementation-dependent feature */
>@@ -733,12 +733,19 @@
>        XcmsColorDbState = XcmsDbInitFailure;
>        return(XcmsFailure);
>     }
>+    stream = _XFopenFile (pathname, "r");
>+    if (stream == NULL) {
>+       return(XcmsFailure);
>+    }
> 
>-    if ((stream = _XFopenFile (pathname, "r")) == NULL) {
>+    ret=stringSectionSize(stream, &nEntries, &size);
>+
>+    if (ret != XcmsSuccess || nEntries == 0 ) {
>+      (void) fclose(stream);
>+       XcmsColorDbState = XcmsDbInitFailure;
>        return(XcmsFailure);
>     }
> 
>-    stringSectionSize(stream, &nEntries, &size);
>     rewind(stream);
> 
>     strings = (char *) Xmalloc(size);
>

Actions: View | Splinter Review

Attachments on bug 15305: 15606 | 15668

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.