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

ICU-6375 Add option for reducing spurious valgrind errors

Browse Source 
X-SVN-Rev: 25586
This commit is contained in:
Andy Heninger 2009-03-13 23:49:56 +00:00
parent ab81668cd3
commit 7ba40f1363
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/source/common/unicode/unistr.h
View File

@ -4162,9 +4162,12 @@ UnicodeString::getTerminatedBuffer() {
} else {
UChar *array = getArrayStart();
int32_t len = length();
#ifndef U_VALGRIND
if(len < getCapacity() && array[len] == 0) {
return array;
} else if(cloneArrayIfNeeded(len+1)) {
}
#endif
if(cloneArrayIfNeeded(len+1)) {
array = getArrayStart();
array[len] = 0;
return array;

10
icu4c/source/test/intltest/ustrtest.cpp
View File

@ -1090,7 +1090,15 @@ UnicodeStringTest::TestMiscellaneous()
test1.setTo(TRUE, u, -1);
q=test1.getTerminatedBuffer();
if(q!=u || test1.length()!=4 || q[3]!=8 || q[4]!=0) {
#ifndef U_VALGRIND
// The VALGRIND option always copies the buffer for getTerminatedBuffer(),
// to avoid reading uninitialized memory when checking for the termination.
if(q!=u) {
errln("UnicodeString(u[-1]).getTerminatedBuffer() returns a bad buffer");
}
#endif
if(test1.length()!=4 || q[3]!=8 || q[4]!=0) {
errln("UnicodeString(u[-1]).getTerminatedBuffer() returns a bad buffer");
}