Skip to content

Fix MimeMessage::extract_uue() ignoring index greater than zero #73

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

Open
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −0
Open

Fix MimeMessage::extract_uue() ignoring index greater than zero #73

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
1 change: 1 addition & 0 deletions mailparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ PHP_METHOD(mimemessage, extract_uue)
} else {
/* skip that part */
mailparse_do_uudecode(srcstream, NULL);
nparts++;
}
} else {
if (php_stream_tell(srcstream) >= end)
Expand Down
26 changes: 26 additions & 0 deletions tests/extract_uue_multiple_parts.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
MimeMessage::extract_uue() can extract uuencoded parts past the first
--SKIPIF--
<?php if (!extension_loaded("mailparse")) print "skip"; ?>
--FILE--
<?php
/* extract_uue() compared a part counter that it never incremented, so any
* index greater than 0 returned NULL even when the part existed. */
function uue($name, $data) {
return "begin 644 $name\n" . convert_uuencode($data) . "end\n\n";
}
$body = "intro line\n\n" . uue("a.txt", "FIRST") . "\n" . uue("b.txt", "SECOND");

$fp = fopen("php://memory", "r+");
fwrite($fp, $body);
rewind($fp);
$m = new MimeMessage("stream", $fp);
var_dump($m->extract_uue(0, MAILPARSE_EXTRACT_RETURN));
var_dump($m->extract_uue(1, MAILPARSE_EXTRACT_RETURN));
var_dump($m->extract_uue(2, MAILPARSE_EXTRACT_RETURN));
fclose($fp);
?>
--EXPECT--
string(5) "FIRST"
string(6) "SECOND"
NULL
Loading