iliaa Tue Dec 21 10:47:14 2004 EDT Modified files: /php-src/ext/imap php_imap.c Log: Fixed possible crash in imap_mail_compose(). http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.188&r2=1.189&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.188 php-src/ext/imap/php_imap.c:1.189 --- php-src/ext/imap/php_imap.c:1.188 Thu Aug 12 15:31:36 2004 +++ php-src/ext/imap/php_imap.c Tue Dec 21 10:47:14 2004 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.188 2004/08/12 19:31:36 chagenbu Exp $ */ +/* $Id: php_imap.c,v 1.189 2004/12/21 15:47:14 iliaa Exp $ */ #define IMAP41 @@ -2978,6 +2978,10 @@ bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1); memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1); bod->contents.text.size = Z_STRLEN_PP(pvalue); + } else { + bod->contents.text.data = (char *) fs_get(1); + bod->contents.text.data = ""; + bod->contents.text.size = 0; } if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) { convert_to_long_ex(pvalue); @@ -3081,6 +3085,10 @@ bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1); memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1); bod->contents.text.size = Z_STRLEN_PP(pvalue); + } else { + bod->contents.text.data = (char *) fs_get(1); + bod->contents.text.data = ""; + bod->contents.text.size = 0; } if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) { convert_to_long_ex(pvalue);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php