cvs: php4 /ext/imap php_imap.c

kalowsky Wed Aug 14 16:55:11 2002 EDT Modified files: /php4/ext/imap php_imap.c Log: Comming a fix for a compile error found in Bug #15630 # NOTE this is NOT the supplied patch in said bug for fixing imap_utf7_decode Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.134 php4/ext/imap/php_imap.c:1.135 --- php4/ext/imap/php_imap.c:1.134 Mon Aug 5 17:53:09 2002 +++ php4/ext/imap/php_imap.c Wed Aug 14 16:55:11 2002 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.134 2002/08/05 21:53:09 kalowsky Exp $ */ +/* $Id: php_imap.c,v 1.135 2002/08/14 20:55:11 kalowsky Exp $ */ #define IMAP41 @@ -2049,6 +2049,7 @@ zval **arg; const unsigned char *in, *inp, *endp; unsigned char *out, *outp; + unsigned char c; int inlen, outlen; enum { ST_NORMAL, /* printable text */ @@ -2150,13 +2151,15 @@ break; case ST_DECODE1: outp[1] = UNB64(*inp); - *outp++ |= outp[1] >> 4; + c = outp[1] >> 4; + *outp++ |= c; *outp <<= 4; state = ST_DECODE2; break; case ST_DECODE2: outp[1] = UNB64(*inp); - *outp++ |= outp[1] >> 2; + c = outp[1] >> 2; + *outp++ |= c; *outp <<= 6; state = ST_DECODE3; break; @@ -2190,6 +2193,7 @@ zval **arg; const unsigned char *in, *inp, *endp; unsigned char *out, *outp; + unsigned char c; int inlen, outlen; enum { ST_NORMAL, /* printable text */ @@ -2273,12 +2277,14 @@ state = ST_ENCODE1; break; case ST_ENCODE1: - *outp++ = B64(*outp | *inp >> 4); + c = B64(*outp | *inp >> 4); + *outp++ = c; *outp = *inp++ << 2; state = ST_ENCODE2; break; case ST_ENCODE2: - *outp++ = B64(*outp | *inp >> 6); + c = B64(*outp | *inp >> 6); + *outp++ = c; *outp++ = B64(*inp++); state = ST_ENCODE0; case ST_NORMAL: