cvs: php4 /ext/imap/

chagenbu Wed May 10 14:44:44 2000 EDT Modified files: /php4/ext/imap php_imap.c Log: fix for segfault. patch from Jade Nicoletti <nicoletti@nns.ch>. Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.22 php4/ext/imap/php_imap.c:1.23 --- php4/ext/imap/php_imap.c:1.22 Tue May 2 02:44:23 2000 +++ php4/ext/imap/php_imap.c Wed May 10 14:44:44 2000 @@ -23,7 +23,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.22 2000/05/02 00:44:23 sas Exp $ */ +/* $Id: php_imap.c,v 1.23 2000/05/10 12:44:44 chagenbu Exp $ */ #define IMAP41 @@ -3461,7 +3461,7 @@ } if ((encoding_token=(long) php_memnstr(&string[charset_token+2], "?", 1, string+end))) { /* Find token for encoding */ encoding_token -= (long) string; - if ((end_token=(long) php_memnstr(&string[encoding_token+1], "?=", 2, string+end))) { /* Find token for end of encoded data */ + if ((end_token=(long) php_memnstr(&string[encoding_token+3], "?=", 2, string+end))) { /* Find token for end of encoded data */ end_token -= (long) string; memcpy(charset, &string[charset_token+2], encoding_token-(charset_token+2)); /* Extract charset encoding */ charset[encoding_token-(charset_token+2)]=0x00;