cvs: php4(PHP_4_3) /ext/imap php_imap.c
| From: | Frank M. Kromann | Date: | Wed, 27 Nov 2002 18:54:55 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-16716@lists.php.net to get a copy of this message | ||
fmk Wed Nov 27 13:54:55 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/imap php_imap.c
Log:
MFH
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.142 php4/ext/imap/php_imap.c:1.142.2.1
--- php4/ext/imap/php_imap.c:1.142 Wed Oct 9 05:20:46 2002
+++ php4/ext/imap/php_imap.c Wed Nov 27 13:54:54 2002
@@ -20,13 +20,13 @@
| Rasmus Lerdorf <rasmus@php.net> |
| Chuck Hagenbuch <chuck@horde.org> |
| Andrew Skalski <askalski@chekinc.com> |
- | Hartmut Holzgraefe <hartmut@six.de> |
+ | Hartmut Holzgraefe <hholzgra@php.net> |
| Jani Taskinen <sniper@iki.fi> |
| Daniel R. Kalowsky <kalowsky@php.net> |
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142 2002/10/09 09:20:46 mfischer Exp $ */
+/* $Id: php_imap.c,v 1.142.2.1 2002/11/27 18:54:54 fmk Exp $ */
#define IMAP41
@@ -3162,7 +3162,9 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferTo[offset] = 0;
+ if (offset>0) {
+ bufferTo[offset-1] = 0;
+ }
}
if (cc && *cc) {
@@ -3180,7 +3182,9 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferCc[offset] = 0;
+ if (offset>0) {
+ bufferCc[offset-1] = 0;
+ }
}
if (bcc && *bcc) {
@@ -3198,7 +3202,9 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferBcc[offset] = 0;
+ if (offset>0) {
+ bufferBcc[offset-1] = 0;
+ }
}
@@ -3211,8 +3217,15 @@
}
return 0;
}
- if (bufferCc) efree(bufferCc);
- if (bufferBcc) efree(bufferBcc);
+ if (bufferTo) {
+ efree(bufferTo);
+ }
+ if (bufferCc) {
+ efree(bufferCc);
+ }
+ if (bufferBcc) {
+ efree(bufferBcc);
+ }
#else
if (!INI_STR("sendmail_path")) {
return 0;