diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-06-16 17:41:52 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-06-16 17:41:52 +0000 |
| commit | df32619d63f2ae7e491e019e0d8ce6c38a776fa8 (patch) | |
| tree | e03461eeb56b3b979c1dd2ad3d1f59638ee62bd7 /ext/imap/php_imap.c | |
| parent | 6057160dbf1d34584383621c197943f3f2219545 (diff) | |
| download | php-git-df32619d63f2ae7e491e019e0d8ce6c38a776fa8.tar.gz | |
Fixed bug #24150 (crash in imap_fetch_overview() &
imap_rfc822_write_address())
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index eb34655435..26faae27c4 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1997,6 +1997,10 @@ PHP_FUNCTION(imap_rfc822_write_address) addr->error=NIL; addr->adl=NIL; + if (_php_imap_address_size(addr) >= MAILTMPLEN) { + RETURN_FALSE; + } + string[0]='\0'; rfc822_write_address(string, addr); RETVAL_STRING(string, 1); @@ -2745,13 +2749,13 @@ PHP_FUNCTION(imap_fetch_overview) if (env->subject) { add_property_string(myoverview, "subject", env->subject, 1); } - if (env->from) { + if (env->from && _php_imap_address_size(env->from) >= MAILTMPLEN) { env->from->next=NULL; address[0] = '\0'; rfc822_write_address(address, env->from); add_property_string(myoverview, "from", address, 1); } - if (env->to) { + if (env->to && _php_imap_address_size(env->from) >= MAILTMPLEN) { env->to->next = NULL; address[0] = '\0'; rfc822_write_address(address, env->to); |