iliaa           Mon Mar 19 22:56:58 2007 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/imap/tests     bug40854.phpt 

  Modified files:              
    /php-src/ext/imap   php_imap.c 
    /php-src    NEWS 
  Log:
  
  Fixed bug #40854 (imap_mail_compose() creates an invalid terminator for 
  multipart e-mails).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.23&r2=1.208.2.7.2.24&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.23 
php-src/ext/imap/php_imap.c:1.208.2.7.2.24
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.23  Sun Mar 11 18:42:19 2007
+++ php-src/ext/imap/php_imap.c Mon Mar 19 22:56:57 2007
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.23 2007/03/11 18:42:19 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.24 2007/03/19 22:56:57 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3188,7 +3188,7 @@
                                                disp_param->next = tmp_param;
                                                tmp_param = disp_param;
                                        }
-                               bod->parameter = disp_param;
+                                       bod->parameter = disp_param;
                                }
                        }
                        if (zend_hash_find(Z_ARRVAL_PP(data), "subtype", 
sizeof("subtype"), (void **) &pvalue)== SUCCESS) {
@@ -3337,7 +3337,7 @@
                        } while ((part = part->next)); /* until done */
 
                        /* output trailing cookie */
-                       spprintf(&tempstring, 0, "%s--%s--%s", mystring, tmp, 
CRLF);
+                       spprintf(&tempstring, 0, "%s--%s--%s", mystring, 
cookie, CRLF);
                        efree(mystring);
                        mystring=tempstring;
        } else if (bod) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.601&r2=1.2027.2.547.2.602&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.601 php-src/NEWS:1.2027.2.547.2.602
--- php-src/NEWS:1.2027.2.547.2.601     Mon Mar 19 18:31:29 2007
+++ php-src/NEWS        Mon Mar 19 22:56:57 2007
@@ -21,6 +21,8 @@
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
 - Fixed a thread safety issue in gd gif read code (Nuno, Roman Nemecek)
 - Fixed CVE-2007-1001, GD wbmp used with invalid image size (Pierre)
+- Fixed bug #40854 (imap_mail_compose() creates an invalid terminator for 
+  multipart e-mails). (Ilia)
 - Fixed bug #40848 (sorting issue on 64-bit Solaris). (Wez)
 - Fixed bug #40836 (Segfault in ext/dom). (Rob)
 - Fixed bug #40833 (Crash when using unset() on an ArrayAccess object retrieved

http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/bug40854.phpt?view=markup&rev=1.1
Index: php-src/ext/imap/tests/bug40854.phpt
+++ php-src/ext/imap/tests/bug40854.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to