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

ICU-22365 call u_terminateChars in ULocale(Builder)?

Browse source
This commit is contained in:
Frank Tang 2023-08-24 12:16:50 -07:00 • committed by Frank Yung-Fong Tang
parent 8817c25c1e
commit 29a6ffc350
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
icu4c/source/common/ulocale.cpp
View file

@ -10,6 +10,7 @@
#include "charstr.h"
#include "cmemory.h"
#include "ustr_imp.h"
U_NAMESPACE_USE
#define EXTERNAL(i) (reinterpret_cast<ULocale*>(i))
@ -56,14 +57,16 @@ int32_t ulocale_get ##N ( \
CONST_INTERNAL(locale)->get ## N( \
keywordLength < 0 ? StringPiece(keyword) : StringPiece(keyword, keywordLength), \
sink, *err); \
if (U_FAILURE(*err)) return 0; \
if (sink.Overflowed()) { \
*err = U_BUFFER_OVERFLOW_ERROR; \
return sink.NumberOfBytesAppended()+1; \
int32_t reslen = sink.NumberOfBytesAppended(); \
if (U_FAILURE(*err)) { \
return reslen; \
} \
int32_t len = sink.NumberOfBytesWritten(); \
if (len < bufferCapacity) valueBuffer[len] = '\0'; \
return len; \
if (sink.Overflowed()) { \
*err = U_BUFFER_OVERFLOW_ERROR; \
} else { \
u_terminateChars(valueBuffer, bufferCapacity, reslen, err); \
} \
return reslen; \
}
#define IMPL_ULOCALE_GET_KEYWORDS(N) \

29
icu4c/source/common/ulocbuilder.cpp
View file

@ -10,6 +10,7 @@
#include "unicode/umachine.h"
#include "unicode/ulocbuilder.h"
#include "cstring.h"
#include "ustr_imp.h"
using icu::CheckedArrayByteSink;
using icu::StringPiece;
@ -95,18 +96,10 @@ int32_t ulocbld_buildLocaleID(ULocaleBuilder* builder,
icu::Locale l = INTERNAL(builder)->build(*err);
if (U_FAILURE(*err)) return 0;
int32_t length = (int32_t)(uprv_strlen(l.getName()));
if (length <= bufferCapacity) {
uprv_strncpy(buffer, l.getName(), length);
if (length < bufferCapacity) {
buffer[length] = '\0';
} else {
*err = U_STRING_NOT_TERMINATED_WARNING;
}
return length;
if (0 < length && length <= bufferCapacity) {
uprv_memcpy(buffer, l.getName(), length);
}
*err = U_BUFFER_OVERFLOW_ERROR;
uprv_memcpy(buffer, l.getName(), bufferCapacity);
return length;
return u_terminateChars(buffer, bufferCapacity, length, err);
}
int32_t ulocbld_buildLanguageTag(ULocaleBuilder* builder,
@ -119,22 +112,16 @@ int32_t ulocbld_buildLanguageTag(ULocaleBuilder* builder,
if (U_FAILURE(*err)) return 0;
CheckedArrayByteSink sink(buffer, bufferCapacity);
l.toLanguageTag(sink, *err);
int32_t reslen = sink.NumberOfBytesAppended();
if (U_FAILURE(*err)) {
return 0;
return reslen;
}
if (sink.Overflowed()) {
*err = U_BUFFER_OVERFLOW_ERROR;
return sink.NumberOfBytesAppended();
}
int32_t written = sink.NumberOfBytesWritten();
if (written < bufferCapacity) {
// null terminate
buffer[written] = '\0';
} else {
*err = U_STRING_NOT_TERMINATED_WARNING;
u_terminateChars(buffer, bufferCapacity, reslen, err);
}
return written;
return reslen;
}
UBool ulocbld_copyErrorTo(const ULocaleBuilder* builder, UErrorCode *outErrorCode) {