XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1629 - Fix crash

Browse Source 
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").
This commit is contained in:
Roland Mainz
2004-10-14 02:20:52 +00:00
parent 3a055ea35b
commit a0251ee285
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Xprint/pcl/PclInit.c
View File

@@ -427,7 +427,7 @@ PclInitContext(XpContextPtr pCon)
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,
@@ -440,7 +440,7 @@ PclInitContext(XpContextPtr pCon)
*/
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 );
@@ -452,7 +452,7 @@ PclInitContext(XpContextPtr pCon)
*/
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 );

6
Xprint/ps/PsInit.c
View File

@@ -492,7 +492,7 @@ PsInitContext(pCon)
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;
}
@@ -506,7 +506,7 @@ PsInitContext(pCon)
*/
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;
}
@@ -519,7 +519,7 @@ PsInitContext(pCon)
*/
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;
}