Constify hdr

Author: twose

ext/standard/mail.c

@@ -386,7 +386,7 @@ void php_mail_log_to_file(char *filename, char *message, size_t message_size) {
 }
 
 
-static int php_mail_detect_multiple_crlf(char *hdr) {
+static int php_mail_detect_multiple_crlf(const char *hdr) {
 	/* This function detects multiple/malformed multiple newlines. */
 
 	if (!hdr || !strlen(hdr)) {
@@ -436,14 +436,15 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
 	char *sendmail_path = INI_STR("sendmail_path");
 	char *sendmail_cmd = NULL;
 	char *mail_log = INI_STR("mail.log");
-	char *hdr = (char *) headers;
+	const char *hdr = headers;
+	char *ahdr = NULL;
 #if PHP_SIGCHILD
 	void (*sig_handler)() = NULL;
 #endif
 
 #define MAIL_RET(val) \
-	if (hdr != headers) {	\
-		efree(hdr);	\
+	if (ahdr != NULL) {	\
+		efree(ahdr);	\
 	}	\
 	return val;	\
 
@@ -486,10 +487,11 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
 		f = php_basename(tmp, strlen(tmp), NULL, 0);
 
 		if (headers != NULL && *headers) {
-			spprintf(&hdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s\r\n%s", php_getuid(), ZSTR_VAL(f), headers);
+			spprintf(&ahdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s\r\n%s", php_getuid(), ZSTR_VAL(f), headers);
 		} else {
-			spprintf(&hdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s", php_getuid(), ZSTR_VAL(f));
+			spprintf(&ahdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s", php_getuid(), ZSTR_VAL(f));
 		}
+		hdr = ahdr;
 		zend_string_release_ex(f, 0);
 	}