organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-22753 Fix read-after-move in MF2

Browse source 
In StaticErrors::addError() and DynamicErrors::addError(),
don't read from `e` after moving out of it.
This commit is contained in:
Tim Chevalier 2024-04-25 15:06:38 -07:00 • committed by Elango Cheran
parent 084af5c2b6
commit e6ac2a292f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/i18n/messageformat2_errors.cpp
View file

@ -189,10 +189,12 @@ namespace message2 {
void StaticErrors::addError(StaticError&& e, UErrorCode& status) {
CHECK_ERROR(status);
StaticErrorType type = e.type;
void* errorP = static_cast<void*>(create<StaticError>(std::move(e), status));
U_ASSERT(syntaxAndDataModelErrors.isValid());
switch (e.type) {
switch (type) {
case StaticErrorType::SyntaxError: {
syntaxError = true;
break;
@ -229,10 +231,12 @@ namespace message2 {
void DynamicErrors::addError(DynamicError&& e, UErrorCode& status) {
CHECK_ERROR(status);
DynamicErrorType type = e.type;
void* errorP = static_cast<void*>(create<DynamicError>(std::move(e), status));
U_ASSERT(resolutionAndFormattingErrors.isValid());
switch (e.type) {
switch (type) {
case DynamicErrorType::UnresolvedVariable: {
unresolvedVariableError = true;
resolutionAndFormattingErrors->adoptElement(errorP, status);