Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix problem with SetLeafName r+a=mcmullen

Browse Source
This commit is contained in:
bienvenu%netscape.com 1999-03-22 19:15:30 +00:00
parent b871eeea13
commit 46d901db87
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/src/nsFileSpec.cpp
View File

@ -227,6 +227,8 @@ void nsSimpleCharString::ReallocData(PRUint32 inLength)
PRUint32 allocLength = inLength;
if (allocLength < kMinStringSize)
allocLength = kMinStringSize;
if (allocLength < Length()) // make sure we're not truncating the result.
allocLength = Length();
Data* newData = (Data*)PR_Malloc(allocLength + sizeof(Data));
// If data was already allocated when we get to here, then we are cloning the data
// from a shared pointer.
@ -289,18 +291,23 @@ void nsSimpleCharString::LeafReplace(char inSeparator, const char* inLeafName)
PRBool trailingSeparator = (lastSeparator + 1 == chars + oldLength);
if (trailingSeparator)
{
char savedCh = *lastSeparator;
char *savedLastSeparator = lastSeparator;
*lastSeparator = '\0';
lastSeparator = strrchr(chars, inSeparator);
*savedLastSeparator = savedCh;
}
if (lastSeparator)
lastSeparator++; // point at the trailing string
else
lastSeparator = chars; // the full monty
*lastSeparator = '\0'; // strip the current leaf name
int newLength = (lastSeparator - chars) + strlen(inLeafName) + int(trailingSeparator);
PRUint32 savedLastSeparatorOffset = (lastSeparator - chars);
int newLength = (lastSeparator - chars) + strlen(inLeafName) + (trailingSeparator != 0);
ReallocData(newLength);
chars = mData->mString; // it might have moved.
chars[savedLastSeparatorOffset] = '\0'; // strip the current leaf name
strcat(chars, inLeafName);
if (trailingSeparator)

11
xpcom/io/nsFileSpec.cpp
View File

@ -227,6 +227,8 @@ void nsSimpleCharString::ReallocData(PRUint32 inLength)
PRUint32 allocLength = inLength;
if (allocLength < kMinStringSize)
allocLength = kMinStringSize;
if (allocLength < Length()) // make sure we're not truncating the result.
allocLength = Length();
Data* newData = (Data*)PR_Malloc(allocLength + sizeof(Data));
// If data was already allocated when we get to here, then we are cloning the data
// from a shared pointer.
@ -289,18 +291,23 @@ void nsSimpleCharString::LeafReplace(char inSeparator, const char* inLeafName)
PRBool trailingSeparator = (lastSeparator + 1 == chars + oldLength);
if (trailingSeparator)
{
char savedCh = *lastSeparator;
char *savedLastSeparator = lastSeparator;
*lastSeparator = '\0';
lastSeparator = strrchr(chars, inSeparator);
*savedLastSeparator = savedCh;
}
if (lastSeparator)
lastSeparator++; // point at the trailing string
else
lastSeparator = chars; // the full monty
*lastSeparator = '\0'; // strip the current leaf name
int newLength = (lastSeparator - chars) + strlen(inLeafName) + int(trailingSeparator);
PRUint32 savedLastSeparatorOffset = (lastSeparator - chars);
int newLength = (lastSeparator - chars) + strlen(inLeafName) + (trailingSeparator != 0);
ReallocData(newLength);
chars = mData->mString; // it might have moved.
chars[savedLastSeparatorOffset] = '\0'; // strip the current leaf name
strcat(chars, inLeafName);
if (trailingSeparator)