BRL-CAD/icu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ICU-23443 Fix heap under-allocation and missing OOM check in VTimeZone/IZRule C wrappers

Browse Source
This commit is contained in:
UnLucky252
2026-07-17 15:28:18 -04:00
committed by Yoshito Umaoka
parent 54e3382691
commit 18320be71d
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
icu4c/source/i18n/vzone.cpp
+36 -6
View File
@@ -83,30 +83,60 @@ U_CAPI void U_EXPORT2
vzone_write(VZone* zone, char16_t* & result, int32_t & resultLength, UErrorCode& status) {
UnicodeString s;
((VTimeZone*)zone)->VTimeZone::write(s, status);
if (U_FAILURE(status)) {
result = nullptr;
resultLength = 0;
return;
}
resultLength = s.length();
result = (char16_t*)uprv_malloc(resultLength);
memcpy(result,s.getBuffer(),resultLength);
result = static_cast<char16_t*>(uprv_malloc(resultLength * sizeof(char16_t)));
if (result == nullptr) {
status = U_MEMORY_ALLOCATION_ERROR;
resultLength = 0;
return;
}
memcpy(result, s.getBuffer(), resultLength * sizeof(char16_t));
}
U_CAPI void U_EXPORT2
vzone_writeFromStart(VZone* zone, UDate start, char16_t* & result, int32_t & resultLength, UErrorCode& status) {
UnicodeString s;
((VTimeZone*)zone)->VTimeZone::write(start, s, status);
if (U_FAILURE(status)) {
result = nullptr;
resultLength = 0;
return;
}
resultLength = s.length();
result = (char16_t*)uprv_malloc(resultLength);
memcpy(result,s.getBuffer(),resultLength);
result = static_cast<char16_t*>(uprv_malloc(resultLength * sizeof(char16_t)));
if (result == nullptr) {
status = U_MEMORY_ALLOCATION_ERROR;
resultLength = 0;
return;
}
memcpy(result, s.getBuffer(), resultLength * sizeof(char16_t));
}
U_CAPI void U_EXPORT2
vzone_writeSimple(VZone* zone, UDate time, char16_t* & result, int32_t & resultLength, UErrorCode& status) {
UnicodeString s;
((VTimeZone*)zone)->VTimeZone::writeSimple(time, s, status);
if (U_FAILURE(status)) {
result = nullptr;
resultLength = 0;
return;
}
resultLength = s.length();
result = (char16_t*)uprv_malloc(resultLength);
memcpy(result,s.getBuffer(),resultLength);
result = static_cast<char16_t*>(uprv_malloc(resultLength * sizeof(char16_t)));
if (result == nullptr) {
status = U_MEMORY_ALLOCATION_ERROR;
resultLength = 0;
return;
}
memcpy(result, s.getBuffer(), resultLength * sizeof(char16_t));
}
U_CAPI int32_t U_EXPORT2
icu4c/source/i18n/zrule.cpp
+6 -2
View File
@@ -93,8 +93,12 @@ izrule_getName(IZRule* rule, char16_t* & name, int32_t & nameLength) {
UnicodeString s;
((InitialTimeZoneRule*)rule)->InitialTimeZoneRule::getName(s);
nameLength = s.length();
name = (char16_t*)uprv_malloc(nameLength);
memcpy(name, s.getBuffer(), nameLength);
name = (char16_t*)uprv_malloc(nameLength * sizeof(char16_t));
if (name == nullptr) {
nameLength = 0;
return;
}
memcpy(name, s.getBuffer(), nameLength * sizeof(char16_t));
}
U_CAPI int32_t U_EXPORT2