Skip to content

Fix out-of-bounds read in RFC822 group/route-addr address parsing #64

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 1 commit into from
+34 −8
Closed

Fix out-of-bounds read in RFC822 group/route-addr address parsing #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions php_mailparse_rfc822.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static void parse_address_tokens(php_rfc822_tokenized_t *toks,
;

/* the stuff from start_tok to i - 1 is the display name part */
if (addrs && !in_group && i - start_tok > 0) {
if (addrs && !in_group && i - start_tok > 0 && iaddr < addrs->naddrs) {
int j, has_comments = 0, has_strings = 0;
switch(i < toks->ntokens ? toks->tokens[i].token : 0) {
case ';': case ',': case '<':
Expand Down Expand Up @@ -561,9 +561,10 @@ static void parse_address_tokens(php_rfc822_tokenized_t *toks,
}

if (addrs && address_value) {
int slot_ok = iaddr < addrs->naddrs;

/* if no display name has been given, use the address */
if (addrs->addrs[iaddr].name == NULL) {
if (slot_ok && addrs->addrs[iaddr].name == NULL) {
addrs->addrs[iaddr].name = estrdup(address_value);
}

Expand All @@ -572,8 +573,10 @@ static void parse_address_tokens(php_rfc822_tokenized_t *toks,
smart_string_appendl(&group_addrs, ",", 1);
smart_string_appends(&group_addrs, address_value);
efree(address_value);
} else {
} else if (slot_ok) {
addrs->addrs[iaddr].address = address_value;
} else {
efree(address_value);
}
address_value = NULL;
}
Expand All @@ -586,7 +589,7 @@ static void parse_address_tokens(php_rfc822_tokenized_t *toks,
if ((start_tok < toks->ntokens && toks->tokens[start_tok].token == ';') || start_tok == toks->ntokens) {
/* end of group */

if (addrs) {
if (addrs && iaddr < addrs->naddrs) {
smart_string_appendl(&group_addrs, ";", 1);
smart_string_0(&group_addrs);
addrs->addrs[iaddr].address = estrdup(group_addrs.c);
Expand Down
11 changes: 7 additions & 4 deletions php_mailparse_rfc822.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ mailbox: /* addr-spec / phrase route-addr */
;

/* the stuff from start_tok to i - 1 is the display name part */
if (addrs && !in_group && i - start_tok > 0) {
if (addrs && !in_group && i - start_tok > 0 && iaddr < addrs->naddrs) {
int j, has_comments = 0, has_strings = 0;
switch(i < toks->ntokens ? toks->tokens[i].token : 0) {
case ';': case ',': case '<':
Expand Down Expand Up @@ -424,9 +424,10 @@ mailbox: /* addr-spec / phrase route-addr */
}

if (addrs && address_value) {
int slot_ok = iaddr < addrs->naddrs;

/* if no display name has been given, use the address */
if (addrs->addrs[iaddr].name == NULL) {
if (slot_ok && addrs->addrs[iaddr].name == NULL) {
addrs->addrs[iaddr].name = estrdup(address_value);
}

Expand All @@ -435,8 +436,10 @@ mailbox: /* addr-spec / phrase route-addr */
smart_string_appendl(&group_addrs, ",", 1);
smart_string_appends(&group_addrs, address_value);
efree(address_value);
} else {
} else if (slot_ok) {
addrs->addrs[iaddr].address = address_value;
} else {
efree(address_value);
}
address_value = NULL;
}
Expand All @@ -449,7 +452,7 @@ mailbox: /* addr-spec / phrase route-addr */
if ((start_tok < toks->ntokens && toks->tokens[start_tok].token == ';') || start_tok == toks->ntokens) {
/* end of group */

if (addrs) {
if (addrs && iaddr < addrs->naddrs) {
smart_string_appendl(&group_addrs, ";", 1);
smart_string_0(&group_addrs);
addrs->addrs[iaddr].address = estrdup(group_addrs.c);
Expand Down
20 changes: 20 additions & 0 deletions tests/rfc822_group_routeaddr_oob.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
A route-addr inside a group does not read past the parsed address array
--SKIPIF--
<?php if (!extension_loaded("mailparse")) print "skip"; ?>
--FILE--
<?php
/* A group whose inner mailbox is an unterminated route-addr ("<" with no ">")
* used to desync the counting and building passes of the address parser and
* index one slot past the end of the allocated address array. */
foreach (array("<>:<", ":;:<", "a@b,<>:<") as $in) {
$r = mailparse_rfc822_parse_addresses($in);
var_dump(is_array($r));
}
echo "done\n";
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
done
Loading