Simplify Code.

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index f900c9b03cb801289a5f28cb0c659cb7682554b3..1257731b246cbf47db10c714c813ee7f52277a9e 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3169,8 +3169,7 @@ PHP_FUNCTION(imap_mail_compose)
 
                efree(tempstring);
        } else {
-               mystring = emalloc(strlen(tmp) + 1);
-               strcpy(mystring, tmp);
+               mystring = estrdup(tmp);
        }
 
        bod = topbod;
@@ -3206,10 +3205,9 @@ PHP_FUNCTION(imap_mail_compose)
 
                        /* output cookie, mini-header, and contents */
                                tempstring=emalloc(strlen(mystring)+strlen(tmp)+1);
-                               strcpy(tempstring, mystring);
+                               sprintf(tempstring, "%s%s", mystring, tmp);
                                efree(mystring);
                                mystring=tempstring;
-                               strcat(mystring, tmp);
 
                                bod=&part->body;