summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2007-03-19 22:56:57 +0000
committerIlia Alshanetsky <iliaa@php.net>2007-03-19 22:56:57 +0000
commit13aac95bfc915cad93916105ac2848455831000f (patch)
tree802cf7d4ae8c0b63b703054ab8c5468200776850 /ext/imap/php_imap.c
parentb0a875104eabf24cf2f210655d84b18b01a00791 (diff)
downloadphp-git-13aac95bfc915cad93916105ac2848455831000f.tar.gz
Fixed bug #40854 (imap_mail_compose() creates an invalid terminator for
multipart e-mails).
Diffstat (limited to 'ext/imap/php_imap.c')
-rw-r--r--ext/imap/php_imap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index aedfe5d571..aa3c26182e 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3188,7 +3188,7 @@ PHP_FUNCTION(imap_mail_compose)
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 @@ PHP_FUNCTION(imap_mail_compose)
} 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) {