Attachment 1107 Details for Bug 1629 – [FIXED_X11R68x] Patch for 2004-10-14-trunk

[patch] [FIXED_X11R68x] Patch for 2004-10-14-trunk

patch.gudiff (text/plain), 6.75 KB, created by Roland Mainz on 2004-10-13 19:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-10-13 19:18:37 UTC

Size: 6.75 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.460
>diff -u -2 -0 -r1.460 ChangeLog
>--- xc/ChangeLog	13 Oct 2004 23:02:42 -0000	1.460
>+++ xc/ChangeLog	14 Oct 2004 02:16:49 -0000
>@@ -1,20 +1,28 @@
>+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").
>+
> 2004-10-04 Vladimir Dergachev <volodya@mindspring.com>
> 
>        Modified:
>         * xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
>         * xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.h
>        Squash annoying warning about fi1236_dump_status
> 	
> 2004-10-13 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/programs/Imakefile
>         Bugzilla #1372: Fix build bustage in Broadway/XRX code when
>         Xaw8 is not available.
> 
> 2004-10-13  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* programs/xdm/sessreg.c:
> 	Bug #1627: Zero out struct utmp before writing it to prevent garbage
> 	fields.  (Egmont Koblinger)
> 
> 2004-10-13  Alexander Gottwald  <ago@freedesktop.org>
> 
>Index: xc/programs/Xserver/Xprint/pcl/PclInit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/PclInit.c,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 PclInit.c
>--- xc/programs/Xserver/Xprint/pcl/PclInit.c	3 Oct 2004 23:29:20 -0000	1.3
>+++ xc/programs/Xserver/Xprint/pcl/PclInit.c	14 Oct 2004 02:16:57 -0000
>@@ -410,66 +410,66 @@
> 
> #ifdef XP_PCL_LJ3
>     /*
>      * Initialize the spooling buffer for saving the figures temporary
>      * (LaserJet IIIs printers don't support the macro function which
>      *  includes some HP-GL/2 commands.)
>      */
>     pConPriv->fcount = 0;
>     if ( !(pConPriv->figures = (char *)xalloc(1024)) )
> 	pConPriv->fcount_max = 0;
>     else
> 	pConPriv->fcount_max = 1024;
> #endif /* XP_PCL_LJ3 */
>     
>     /*
>      * document-attributes-supported
>      */
>     server = XpGetOneAttribute( pCon, XPServerAttr, DOC_ATT_SUPP );
>     if( ( attrStr = (char *)xalloc(strlen(server) + strlen(DOC_ATT_SUPP)
> 				   + strlen(DOC_ATT_VAL) +
>-				   strlen(PAGE_ATT_VAL) + 6 ) ) 
>+				   strlen(PAGE_ATT_VAL) + 8 ) ) 
>        == (char *)NULL )
>       return BadAlloc;
>     sprintf( attrStr, "*%s:\t%s %s %s", DOC_ATT_SUPP, server,
> 	    DOC_ATT_VAL, PAGE_ATT_VAL );
>     XpAugmentAttributes( pCon, XPPrinterAttr, attrStr );
>     xfree( attrStr );
>     
>     /*
>      * job-attributes-supported
>      */
>     server = XpGetOneAttribute( pCon, XPServerAttr, JOB_ATT_SUPP );
>     if( ( attrStr = (char *)xalloc(strlen(server) + strlen(JOB_ATT_SUPP)
>-				   + strlen(JOB_ATT_VAL) + 4 ) ) 
>+				   + strlen(JOB_ATT_VAL) + 8 ) ) 
>        == (char *)NULL )
>       return BadAlloc;
>     sprintf( attrStr, "*%s:\t%s %s", JOB_ATT_SUPP, server, JOB_ATT_VAL );
>     XpAugmentAttributes( pCon, XPPrinterAttr, attrStr );
>     xfree( attrStr );
>     
>     /*
>      * xp-page-attributes-supported
>      */
>     server = XpGetOneAttribute( pCon, XPServerAttr, PAGE_ATT_SUPP );
>     if( ( attrStr = (char *)xalloc(strlen(server) + strlen(PAGE_ATT_SUPP)
>-				   + strlen(PAGE_ATT_VAL) + 4 ) ) 
>+				   + strlen(PAGE_ATT_VAL) + 8 ) ) 
>        == (char *)NULL )
>       return BadAlloc;
>     sprintf( attrStr, "*%s:\t%s %s", PAGE_ATT_SUPP, server, PAGE_ATT_VAL );
>     XpAugmentAttributes( pCon, XPPrinterAttr, attrStr );
>     xfree( attrStr );
> 
>     /*
>      * Validate the attribute pools
>      */
>     XpValidateAttributePool( pCon, XPPrinterAttr, &PclValidatePoolsRec );
> 
>     /*
>      * Munge the reproducible areas to reflect the fact that PCL will not let
>      * me move the right or left margins closer than .25" to the edge of the
>      * paper.
>      */
>     m = XpGetMediumSSAttr( pCon, XPPrinterAttr,
> 			  xpoid_att_medium_source_sizes_supported, 
> 			  (const XpOidList*) NULL,
> 			  (const XpOidList*) NULL );
>Index: xc/programs/Xserver/Xprint/ps/PsInit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/PsInit.c,v
>retrieving revision 1.5
>diff -u -2 -0 -r1.5 PsInit.c
>--- xc/programs/Xserver/Xprint/ps/PsInit.c	4 Oct 2004 05:04:14 -0000	1.5
>+++ xc/programs/Xserver/Xprint/ps/PsInit.c	14 Oct 2004 02:16:57 -0000
>@@ -475,68 +475,68 @@
>   pConPriv =
>       (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
> 
>   memset(pConPriv, 0, sizeof(PsContextPrivRec));
>   pConPriv->jobFileName         = (char *)NULL;
>   pConPriv->pJobFile            = (FILE *)NULL;
>   pConPriv->dash                = (unsigned char *)NULL;
>   pConPriv->validGC             = 0;
>   pConPriv->getDocClient        = (ClientPtr)NULL;
>   pConPriv->getDocBufSize       = 0;
>   pConPriv->pPsOut              = NULL;
>   pConPriv->fontInfoRecords     = NULL;
>   pConPriv->fontTypeInfoRecords = NULL;
> 
>   /*
>    * document-attributes-supported
>    */
>   server = XpGetOneAttribute( pCon, XPServerAttr, DOC_ATT_SUPP );
>   if ((attrStr = (char *) xalloc(strlen(server) +
> 				strlen(DOC_ATT_SUPP) + strlen(DOC_ATT_VAL)
>-				+ strlen(PAGE_ATT_VAL) + 6)) == NULL) 
>+				+ strlen(PAGE_ATT_VAL) + 8)) == NULL) 
>   {
>       return BadAlloc;
>   }
>   sprintf(attrStr, "*%s:\t%s %s %s", 
> 	  DOC_ATT_SUPP, server, DOC_ATT_VAL, PAGE_ATT_VAL);
>   XpAugmentAttributes( pCon, XPPrinterAttr, attrStr);
>   xfree(attrStr);
>     
>   /*
>    * job-attributes-supported
>    */
>   server = XpGetOneAttribute( pCon, XPServerAttr, JOB_ATT_SUPP );
>   if ((attrStr = (char *) xalloc(strlen(server) + strlen(JOB_ATT_SUPP) +
>-				 strlen(JOB_ATT_VAL) + 4)) == NULL)
>+				 strlen(JOB_ATT_VAL) + 8)) == NULL)
>   {
>       return BadAlloc;
>   }
>   sprintf(attrStr, "*%s:\t%s %s", JOB_ATT_SUPP, server, JOB_ATT_VAL);
>   XpAugmentAttributes(pCon, XPPrinterAttr, attrStr);
>   xfree(attrStr);
>     
>   /*
>    * xp-page-attributes-supported
>    */
>   server = XpGetOneAttribute( pCon, XPServerAttr, PAGE_ATT_SUPP );
>   if ((attrStr = (char *) xalloc(strlen(server) + strlen(PAGE_ATT_SUPP) +
>-				 strlen(PAGE_ATT_VAL) + 4)) == NULL)
>+				 strlen(PAGE_ATT_VAL) + 8)) == NULL)
>   {
>       return BadAlloc;
>   }
>   sprintf(attrStr, "*%s:\t%s %s", PAGE_ATT_SUPP, server, PAGE_ATT_VAL);
>   XpAugmentAttributes(pCon, XPPrinterAttr, attrStr);
>   xfree(attrStr);
> 
>   /*
>    * Validate the attribute pools
>    */
>   XpValidateAttributePool(pCon, XPPrinterAttr, &PsValidatePoolsRec);
>   XpValidateAttributePool(pCon, XPDocAttr, &PsValidatePoolsRec);
>   XpValidateAttributePool(pCon, XPJobAttr, &PsValidatePoolsRec);
>   XpValidateAttributePool(pCon, XPPageAttr, &PsValidatePoolsRec);
> 
>   return Success;
> }
> 
> static Bool
> PsDestroyContext(pCon)

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1629: 1107

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.