Skip to content

Avoid double allocation when joining To/Cc headers #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iliaal wants to merge 2 commits into from
+9 −11
Closed

Avoid double allocation when joining To/Cc headers #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff29e18
Avoid double allocation when joining To/Cc headers
iliaal Jun 7, 2026
7059ea1
Copy header_val null terminator in memcpy, drop explicit terminator
iliaal Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions php_mailparse_mime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,17 +435,15 @@ static int php_mimepart_process_header(php_mimepart *part)
* join multiple To: or Cc: lines together */
header_zstring = zend_string_init(header_key, strlen(header_key), 0);
if ((strcmp(header_key, "to") == 0 || strcmp(header_key, "cc") == 0) && (zheaderval = zend_hash_find(Z_ARRVAL_P(&part->headerhash), header_zstring)) != NULL) {
int newlen;
char *newstr;

newlen = strlen(header_val) + Z_STRLEN_P(zheaderval) + 3;
newstr = emalloc(newlen);

strcpy(newstr, Z_STRVAL_P(zheaderval));
strcat(newstr, ", ");
strcat(newstr, header_val);
add_assoc_string(&part->headerhash, header_key, newstr);
efree(newstr);
zend_string *existing = Z_STR_P(zheaderval);
size_t existing_len = ZSTR_LEN(existing);
size_t add_len = strlen(header_val);
zend_string *joined = zend_string_alloc(existing_len + 2 + add_len, 0);

memcpy(ZSTR_VAL(joined), ZSTR_VAL(existing), existing_len);
memcpy(ZSTR_VAL(joined) + existing_len, ", ", 2);
memcpy(ZSTR_VAL(joined) + existing_len + 2, header_val, add_len + 1);
add_assoc_str(&part->headerhash, header_key, joined);
} else {
if((zheaderval = zend_hash_find(Z_ARRVAL_P(&part->headerhash), header_zstring)) != NULL) {
if(Z_TYPE_P(zheaderval) == IS_ARRAY) {
Expand Down
Loading