From f6b4569d23d6fba7652d68e7ab38873f68537fe1 Mon Sep 17 00:00:00 2001
From: "pierre%netscape.com"
 <pierre%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 4 Nov 1998 06:48:11 +0000
Subject: [PATCH] fixed the 3 instances of Compare() to work with empty strings

git-svn-id: svn://10.0.0.236/trunk@14052 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/base/src/nsString.cpp              | 21 +++++++++++++++++++++
 mozilla/string/obsolete/nsString.cpp       | 21 +++++++++++++++++++++
 mozilla/xpcom/ds/nsString.cpp              | 21 +++++++++++++++++++++
 mozilla/xpcom/string/obsolete/nsString.cpp | 21 +++++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/mozilla/base/src/nsString.cpp b/mozilla/base/src/nsString.cpp
index f5777d0a29b..06957e90825 100644
--- a/mozilla/base/src/nsString.cpp
+++ b/mozilla/base/src/nsString.cpp
@@ -1518,6 +1518,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,anISOLatin1,maxlen);
     }
@@ -1538,6 +1545,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
  */
 PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
   int maxlen=(S.mLength<mLength) ? S.mLength : mLength;
+  if (maxlen == 0) {
+    if ((mLength == 0) && (S.mLength == 0))
+      return 0;
+    if (mLength == 0)
+      return -1;
+    return 1;
+  }
   if (aIgnoreCase) {
     return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
   }
@@ -1558,6 +1572,13 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,aString,maxlen);
     }
diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index f5777d0a29b..06957e90825 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -1518,6 +1518,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,anISOLatin1,maxlen);
     }
@@ -1538,6 +1545,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
  */
 PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
   int maxlen=(S.mLength<mLength) ? S.mLength : mLength;
+  if (maxlen == 0) {
+    if ((mLength == 0) && (S.mLength == 0))
+      return 0;
+    if (mLength == 0)
+      return -1;
+    return 1;
+  }
   if (aIgnoreCase) {
     return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
   }
@@ -1558,6 +1572,13 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,aString,maxlen);
     }
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index f5777d0a29b..06957e90825 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -1518,6 +1518,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,anISOLatin1,maxlen);
     }
@@ -1538,6 +1545,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
  */
 PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
   int maxlen=(S.mLength<mLength) ? S.mLength : mLength;
+  if (maxlen == 0) {
+    if ((mLength == 0) && (S.mLength == 0))
+      return 0;
+    if (mLength == 0)
+      return -1;
+    return 1;
+  }
   if (aIgnoreCase) {
     return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
   }
@@ -1558,6 +1572,13 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,aString,maxlen);
     }
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index f5777d0a29b..06957e90825 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -1518,6 +1518,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,anISOLatin1,maxlen);
     }
@@ -1538,6 +1545,13 @@ PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLe
  */
 PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
   int maxlen=(S.mLength<mLength) ? S.mLength : mLength;
+  if (maxlen == 0) {
+    if ((mLength == 0) && (S.mLength == 0))
+      return 0;
+    if (mLength == 0)
+      return -1;
+    return 1;
+  }
   if (aIgnoreCase) {
     return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
   }
@@ -1558,6 +1572,13 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
+    if (maxlen == 0) {
+      if ((mLength == 0) && (aLength == 0))
+        return 0;
+      if (mLength == 0)
+        return -1;
+      return 1;
+    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,aString,maxlen);
     }