Skip to content

Fix out-of-bounds read on malformed uuencode "begin" line #55

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
+18 −6
Closed

Fix out-of-bounds read on malformed uuencode "begin" line #55

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
24 changes: 18 additions & 6 deletions mailparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,10 +528,14 @@ PHP_METHOD(mimemessage, extract_uue)

/* parse out the file name.
* The next 4 bytes are an octal number for perms; ignore it */
origfilename = &buffer[10];
/* The filename starts after "begin <mode> ". Guard against
* a short "begin" line so we don't index past the NUL
* terminator into stack garbage. */
len = strlen(buffer);
origfilename = &buffer[len > 10 ? 10 : len];
/* NUL terminate the filename */
len = strlen(origfilename);
while(isspace(origfilename[len-1]))
while (len > 0 && isspace((unsigned char)origfilename[len-1]))
origfilename[--len] = '\0';

/* make the return an array */
Expand Down Expand Up @@ -618,10 +622,14 @@ PHP_METHOD(mimemessage, enum_uue)

/* parse out the file name.
* The next 4 bytes are an octal number for perms; ignore it */
origfilename = &buffer[10];
/* The filename starts after "begin <mode> ". Guard against
* a short "begin" line so we don't index past the NUL
* terminator into stack garbage. */
len = strlen(buffer);
origfilename = &buffer[len > 10 ? 10 : len];
/* NUL terminate the filename */
len = strlen(origfilename);
while(isspace(origfilename[len-1]))
while (len > 0 && isspace((unsigned char)origfilename[len-1]))
origfilename[--len] = '\0';

/* make the return an array */
Expand Down Expand Up @@ -812,10 +820,14 @@ PHP_FUNCTION(mailparse_uudecode_all)

/* parse out the file name.
* The next 4 bytes are an octal number for perms; ignore it */
origfilename = &buffer[10];
/* The filename starts after "begin <mode> ". Guard against
* a short "begin" line so we don't index past the NUL
* terminator into stack garbage. */
len = strlen(buffer);
origfilename = &buffer[len > 10 ? 10 : len];
/* NUL terminate the filename */
len = strlen(origfilename);
while(isspace(origfilename[len-1]))
while (len > 0 && isspace((unsigned char)origfilename[len-1]))
origfilename[--len] = '\0';

/* make the return an array */
Expand Down
Loading