AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5161 Fix valgrind and Purify warnings about getTerminatedBuffer and uninitialized memory reads.

Browse Source 
X-SVN-Rev: 19549
This commit is contained in:
George Rhoten 2006-04-14 21:58:41 +00:00
parent 4493abae62
commit 3737c923bd
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icu4c/source/i18n/translit.cpp
View File

@ -107,7 +107,7 @@ UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(Transliterator)
* Return TRUE if the given UTransPosition is valid for text of
* the given length.
*/
inline UBool positionIsValid(UTransPosition& index, int32_t len) {
static inline UBool positionIsValid(UTransPosition& index, int32_t len) {
return !(index.contextStart < 0 ||
index.start < index.contextStart ||
index.limit < index.start ||
@ -126,17 +126,20 @@ inline UBool positionIsValid(UTransPosition& index, int32_t len) {
Transliterator::Transliterator(const UnicodeString& theID,
UnicodeFilter* adoptedFilter) :
UObject(), ID(theID), filter(adoptedFilter),
maximumContextLength(0) {
// NUL-terminate the ID string
ID.getTerminatedBuffer();
maximumContextLength(0)
{
// NUL-terminate the ID string, which is a non-aliased copy.
ID.append((UChar)0);
ID.truncate(ID.length()-1);
}
/**
* Destructor.
*/
Transliterator::~Transliterator() {
delete filter;
if (filter) {
delete filter;
}
}
/**
@ -144,10 +147,11 @@ Transliterator::~Transliterator() {
*/
Transliterator::Transliterator(const Transliterator& other) :
UObject(other), ID(other.ID), filter(0),
maximumContextLength(other.maximumContextLength) {
// NUL-terminate the ID string
ID.getTerminatedBuffer();
maximumContextLength(other.maximumContextLength)
{
// NUL-terminate the ID string, which is a non-aliased copy.
ID.append((UChar)0);
ID.truncate(ID.length()-1);
if (other.filter != 0) {
// We own the filter, so we must have our own copy