diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-10-14 02:20:52 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-10-14 02:20:52 +0000 |
| commit | a0251ee285e1f1e28d06927d8ab7d35d59fda607 (patch) | |
| tree | 60a060f799b64fd71331b4c50042ace33b5aa9c0 /Xprint | |
| parent | 3a055ea35b687e381da4d729dbdd0ebac47f673b (diff) | |
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=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").
Diffstat (limited to 'Xprint')
| -rw-r--r-- | Xprint/pcl/PclInit.c | 6 | ||||
| -rw-r--r-- | Xprint/ps/PsInit.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index dd7575a4e..f48ece041 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -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 ); diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index f85ad78b9..ce0b55752 100644 --- a/Xprint/ps/PsInit.c +++ b/Xprint/ps/PsInit.c @@ -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; } |