MFH

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 4bfcafdad54c9fb14a7bdaef1493b6b30b94aa0f..8602fb95d6976613b153c2371d69b2c73cce1a90 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3147,12 +3147,15 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
        char *bufferTo = NULL, *bufferCc = NULL, *bufferBcc = NULL, *bufferHeader = NULL;
        int offset, bufferLen = 0;;
 
-       if (headers)
+       if (headers) {
                bufferLen += strlen(headers);
-       if (to)
+       }
+       if (to) {
                bufferLen += strlen(to) + 6;
-       if (cc)
+       }
+       if (cc) {
                bufferLen += strlen(cc) + 6;
+       }
 
        bufferHeader = (char *)emalloc(bufferLen);
        memset(bufferHeader, 0, bufferLen);
@@ -3222,8 +3225,9 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
                }
        }
 
-       if (headers && *headers)
+       if (headers && *headers) {
                strcat(bufferHeader, headers);
+       }
 
        if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, bufferHeader, subject, bufferTo, message, bufferCc, bufferBcc, rpath) != SUCCESS) {
                if (tsm_errmsg) {