Fix DateInterval::format segfault (bug #71889) #1837
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tpunt
force-pushed
the
fix-dateinterval-segfault
branch
from
4b5ffb8 to
872a368
Compare
tpunt
force-pushed
the
fix-dateinterval-segfault
branch
from
872a368 to
6be549e
Compare
| @@ -4359,6 +4359,10 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time | |||
|
|
|||
| smart_str_0(&string); | |||
|
|
|||
| if (string.c == NULL) { | |||
| return estrdup(""); | |||
There was a problem hiding this comment.
please use:
return STR_EMPTY_ALLOC();
for PHP7 use:
return ZSTR_EMPTY_ALLOC();
|
LGTM, after you:
|
|
Thanks for the reviews. I've rectified the patch and Travis passes now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a segfault when using
DateInterval::format('%'). This affects PHP 7 and master too./cc @derickr