Attachment 1114 Details for Bug 1637 – [FIXED_X11R68x] Slightly different patch which issues a warning when an unknown |XpOidNotify| value is used.

[patch] [FIXED_X11R68x] Slightly different patch which issues a warning when an unknown |XpOidNotify| value is used.

patch.gudiff (text/plain), 2.93 KB, created by Roland Mainz on 2004-10-15 14:41:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-10-15 14:41:44 UTC

Size: 2.93 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.463
>diff -u -2 -0 -r1.463 ChangeLog
>--- xc/ChangeLog	15 Oct 2004 00:44:06 -0000	1.463
>+++ xc/ChangeLog	15 Oct 2004 21:39:06 -0000
>@@ -1,20 +1,25 @@
>+2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/Xserver/Xprint/Oid.c
>+        Bugzilla #1637: Fix problems in oid code which may cause the
>+        usage of an invalid string pointer (original patch by Egbert Eich).
>+
> Thu Oct 14 20:43:03 2004  Søren Sandmann  <sandmann@redhat.com>
> 
> 	* programs/xmodmap/pf.c (process_line): Fix a
> 	write-to-constant-string issue.
> 	* programs/xmodmap/xmodmap.c (main): Fix several buffer overruns.
> 
> 2004-10-14  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S:
> 	Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating
> 	a text relocation and enabling the server to be built as a
> 	position-independent executable.  (PaX Team)
> 
> 2004-10-14 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/programs/Xserver/Xprint/pcl/PclInit.c
>         * xc/programs/Xserver/Xprint/ps/PsInit.c
>         Bugzilla #1629: Fix crash on AMD64, regression caused by bug
>         1496 ("Xorg Xprt does not support "*xp-listfonts-mode:
>         xp-list-internal-printer-fonts" to toggle the usage of
>         printer-builtin fonts").
>Index: xc/programs/Xserver/Xprint/Oid.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/Oid.c,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 Oid.c
>--- xc/programs/Xserver/Xprint/Oid.c	23 Apr 2004 18:57:32 -0000	1.2
>+++ xc/programs/Xserver/Xprint/Oid.c	15 Oct 2004 21:39:14 -0000
>@@ -2087,50 +2087,50 @@
> 	return XPOID_NOTIFY_EMAIL;
>     else
> 	return XPOID_NOTIFY_UNSUPPORTED;
> }
> 
> /*
>  * ------------------------------------------------------------------------
>  * Name: XpOidNotifyString
>  *
>  * Description:
>  *
>  *
>  * Return value:
>  *
>  *
>  */
> const char* XpOidNotifyString(XpOidNotify notify)
> {
>     switch(notify)
>     {
>-    case XPOID_NOTIFY_UNSUPPORTED:
>-	return (const char*)NULL;
>-	break;
>-    case XPOID_NOTIFY_NONE:
>-	return NOTIFY_NONE_STR;
>-	break;
>-    case XPOID_NOTIFY_EMAIL:
>-	return NOTIFY_EMAIL_STR;
>-	break;
>+       case XPOID_NOTIFY_NONE:
>+           return NOTIFY_NONE_STR;
>+       case XPOID_NOTIFY_EMAIL:
>+           return NOTIFY_EMAIL_STR;
>+       case XPOID_NOTIFY_UNSUPPORTED:
>+           return (const char *)NULL;
>     }
>+
>+    ErrorF("XpOidNotifyString: Unsupported notify=%ld\n", (long)notify);
>+    return (const char *)NULL;
> }
> 
> /*
>  * ------------------------------------------------------------------------
>  * Name: XpOidDocFmtNew
>  *
>  * Description:
>  *
>  *
>  * Return value:
>  *
>  *
>  */
> XpOidDocFmt*
> XpOidDocFmtNew(const char* value_string)
> {
>     XpOidDocFmt* doc_fmt;
>     const char* ptr;
>     
>     if((const char*)NULL == value_string)

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1637: 1109 | 1114

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.