Fix memmove() stuff.

string/obsolete/nsStr.cpp

@@ -275,6 +275,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount,nsIMemoryAg
       //so shift the chars left by theLength...
       (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
     }
     else Truncate(aDest,aDestOffset,anAgent);
   }//if

xpcom/ds/bufferRoutines.h

@@ -66,10 +66,8 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
 void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
   char*   dst = aDest+anOffset;
   char*   src = aDest+anOffset+aCount;
-  char*   end = aDest+aLength+1;
-  PRInt32 cnt = end-src;
 
-  memmove(dst,src,cnt);
+  memmove(dst,src,aLength-(aCount+anOffset));
 }
 
 /**
@@ -99,10 +97,8 @@ void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint3
   PRUnichar* root=(PRUnichar*)aDest;
   PRUnichar* dst = root+anOffset;
   PRUnichar* src = root+anOffset+aCount;
-  PRUnichar* end = root+aLength+1;
-  PRInt32    cnt = end-src;
 
-  memmove(dst,src,cnt*sizeof(PRUnichar));
+  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
 }
 
 

xpcom/ds/nsStr.cpp

@@ -275,6 +275,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount,nsIMemoryAg
       //so shift the chars left by theLength...
       (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
     }
     else Truncate(aDest,aDestOffset,anAgent);
   }//if

xpcom/string/obsolete/nsStr.cpp

@@ -275,6 +275,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount,nsIMemoryAg
       //so shift the chars left by theLength...
       (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
     }
     else Truncate(aDest,aDestOffset,anAgent);
   }//if