ICU-20065 Prevent crash on Collator::makeInstance fail when optimized… #54
Conversation
This file contains 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
|
|
jefgen
previously approved these changes
Aug 13, 2018
icu4c/source/i18n/coll.cpp
Outdated
| @@ -448,6 +448,13 @@ Collator* U_EXPORT2 Collator::createInstance(const Locale& desiredLocale, | |||
| #endif | |||
| { | |||
| coll = makeInstance(desiredLocale, status); | |||
| // Either returns NULL with U_FAILURE(status), or non-NULL with U_SUCCESS(status) | |||
| } | |||
| // The use of *coll in setAttributesFromKeywords can cause causes the NULL check | |||
There was a problem hiding this comment.
Minor nit: "can cause causes" -- the wording feels a bit odd.
There was a problem hiding this comment.
Ah yes, I changed how I wanted to say this midstream and forgot to delete the old wording. Fixed with another commit.
jefgen
approved these changes
Aug 13, 2018
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 26, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 26, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 27, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 27, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 27, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
sffc
pushed a commit
to sffc/icu
that referenced
this pull request
Sep 27, 2018
ICU-20065 Prevent crash on Collator::makeInstance fail when optimized…
hugovdm
added a commit
to hugovdm/icu
that referenced
this pull request
Aug 11, 2020
Fix compiler warnings
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.
In Collator::createInstance, before the call to setAttributesFromKeywords, Collator* Coll will be NULL if U_FAILURE(status). In that case (FAILURE status), setAttributesFromKeywords returns immediately and does not use the dereferenced value *coll. However, the fact that Coll is dereferenced allows C++ compilers to optimize out the NULL check in the subsequent delete. In that case a failure in makeInstance due to a bad key-value such as "collation=private-kana" will cause the "delete Coll" to crash. So we add a seemingly-redundant check for U_FAILURE(status), and return NULL if TRUE, before the call to setAttributesFromKeywords.
Checklist