Skip to content

Use memchr for end-of-line scan in php_mimepart_parse #57

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
Closed

Use memchr for end-of-line scan in php_mimepart_parse #57

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: 5 additions & 6 deletions php_mailparse_mime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,12 +743,9 @@ PHP_MAILPARSE_API int php_mimepart_parse(php_mimepart *part, const char *buf, si

while(bufsize > 0) {
/* look for EOL */
for (len = 0; len < bufsize; len++)
if (buf[len] == '\n') {
break;
}
if (len < bufsize && buf[len] == '\n') {
++len;
const char *eol = memchr(buf, '\n', bufsize);
if (eol != NULL) {
len = (size_t)(eol - buf) + 1; /* include the '\n' */
smart_string_appendl(&part->parsedata.workbuf, buf, len);
if (php_mimepart_process_line(part) == FAILURE) {
/* php_mimepart_process_line() only returns FAILURE in case the count of children
Expand All @@ -765,6 +762,8 @@ PHP_MAILPARSE_API int php_mimepart_parse(php_mimepart *part, const char *buf, si
};
part->parsedata.workbuf.len = 0;
} else {
/* no EOL in this chunk: buffer the remainder for the next call */
len = bufsize;
smart_string_appendl(&part->parsedata.workbuf, buf, len);
}

Expand Down
Loading