Skip to content

ICU-22779 Fixed ICU4C DataBuilderCollationIterator initialization order issue #4111

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

Merged
markusicu merged 1 commit into from
Sep 14, 2026
Merged

ICU-22779 Fixed ICU4C DataBuilderCollationIterator initialization order issue #4111

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
2 changes: 1 addition & 1 deletion icu4c/source/i18n/collationdatabuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class DataBuilderCollationIterator : public CollationIterator {
};

DataBuilderCollationIterator::DataBuilderCollationIterator(CollationDataBuilder &b)
: CollationIterator(&builderData, /*numeric=*/ false),
: CollationIterator(&builderData, /*nullTrie=*/ nullptr, /*numeric=*/ false),
builder(b), builderData(b.nfcImpl),
s(nullptr), pos(0) {
builderData.base = builder.base;
Expand Down
16 changes: 16 additions & 0 deletions icu4c/source/i18n/collationiterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,22 @@ class U_I18N_API_CLASS CollationIterator : public UObject {
protected:
CollationIterator(const CollationIterator &other);

/**
* A special constructor used by DataBuilderCollationIterator, which initializes
* the CollationData in the constructor. The public CollationIterator constructor
* initializes the trie pointer from the CollationData, but it's not yet available
* when DataBuilderCollationIterator invokes the CollationIterator constructor.
* The CollationData used by DataBuilderCollationIterator is the Normalizer2Impl,
* which does not have a trie, so the trie pointer is set to nullptr.
*/
CollationIterator(const CollationData *d, std::nullptr_t nullTrie, UBool numeric)
: trie(nullTrie),
data(d),
cesIndex(0),
skipped(nullptr),
numCpFwd(-1),
isNumeric(numeric) {}

void reset();

/**
Expand Down