cvs: php-src(PHP_4_4) /ext/imap php_imap.c
| From: | Stanislav Malyshev | Date: | Tue, 31 Jul 2007 00:37:02 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45637@lists.php.net to get a copy of this message | ||
stas Tue Jul 31 00:37:02 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/imap php_imap.c
Log:
sometimes c-client returns non-null entry with null host
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.142.2.44.2.12&r2=1.142.2.44.2.13&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.44.2.12 php-src/ext/imap/php_imap.c:1.142.2.44.2.13
--- php-src/ext/imap/php_imap.c:1.142.2.44.2.12 Thu Mar 22 00:08:55 2007
+++ php-src/ext/imap/php_imap.c Tue Jul 31 00:37:01 2007
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.44.2.12 2007/03/22 00:08:55 edink Exp $ */
+/* $Id: php_imap.c,v 1.142.2.44.2.13 2007/07/31 00:37:01 stas Exp $ */
#define IMAP41
@@ -3258,7 +3258,7 @@
addr = NULL;
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
while (addr) {
- if (strcmp(addr->host, ERRHOST) == 0) {
+ if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
PHP_IMAP_BAD_DEST;
} else {
offset += sprintf(bufferTo + offset, "%s@%s,", addr->mailbox, addr->host);
@@ -3281,7 +3281,7 @@
addr = NULL;
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
while (addr) {
- if (strcmp(addr->host, ERRHOST) == 0) {
+ if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
PHP_IMAP_BAD_DEST;
} else {
offset += sprintf(bufferCc + offset, "%s@%s,", addr->mailbox, addr->host);
@@ -3301,7 +3301,7 @@
addr = NULL;
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
while (addr) {
- if (strcmp(addr->host, ERRHOST) == 0) {
+ if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
PHP_IMAP_BAD_DEST;
} else {
offset += sprintf(bufferBcc + offset, "%s@%s,", addr->mailbox, addr->host);