From 50e2ee0edca874e04dabec50fdc9478e1a356c7f Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 27 Mar 2000 22:13:41 +0000
Subject: [PATCH] fixing an off-by-one bug, and the associated problem when
 |mCapacity| and |mLength| are both |0|.  r=waterson

git-svn-id: svn://10.0.0.236/trunk@64249 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsStr.cpp       | 2 +-
 mozilla/xpcom/ds/nsStr.cpp              | 2 +-
 mozilla/xpcom/string/obsolete/nsStr.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp
index 793eb1e5bfe..ff3e67c981f 100644
--- a/mozilla/string/obsolete/nsStr.cpp
+++ b/mozilla/string/obsolete/nsStr.cpp
@@ -285,7 +285,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
  * @param   aDestOffset is where in aDest truncation is to occur
  */
 void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
-  if(aDestOffset<aDest.mCapacity){
+  if(aDest.mCapacity && aDestOffset<=aDest.mCapacity){
     aDest.mLength=aDestOffset;
     AddNullTerminator(aDest);
     NSSTR_SEEN(aDest);
diff --git a/mozilla/xpcom/ds/nsStr.cpp b/mozilla/xpcom/ds/nsStr.cpp
index 793eb1e5bfe..ff3e67c981f 100644
--- a/mozilla/xpcom/ds/nsStr.cpp
+++ b/mozilla/xpcom/ds/nsStr.cpp
@@ -285,7 +285,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
  * @param   aDestOffset is where in aDest truncation is to occur
  */
 void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
-  if(aDestOffset<aDest.mCapacity){
+  if(aDest.mCapacity && aDestOffset<=aDest.mCapacity){
     aDest.mLength=aDestOffset;
     AddNullTerminator(aDest);
     NSSTR_SEEN(aDest);
diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp
index 793eb1e5bfe..ff3e67c981f 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.cpp
+++ b/mozilla/xpcom/string/obsolete/nsStr.cpp
@@ -285,7 +285,7 @@ void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
  * @param   aDestOffset is where in aDest truncation is to occur
  */
 void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
-  if(aDestOffset<aDest.mCapacity){
+  if(aDest.mCapacity && aDestOffset<=aDest.mCapacity){
     aDest.mLength=aDestOffset;
     AddNullTerminator(aDest);
     NSSTR_SEEN(aDest);