From 339d98305074882faf4f78d16c14a9ef2a49bfd0 Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com"
 <ftang%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 29 Jan 1999 18:08:36 +0000
Subject: [PATCH] limit ToUCS2 only have effect in U+0080 to U+009F range so it
 won't mess up non Latin 1 characters

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

diff --git a/mozilla/base/src/nsString.cpp b/mozilla/base/src/nsString.cpp
index 044f0c8d414..1cdd697d754 100644
--- a/mozilla/base/src/nsString.cpp
+++ b/mozilla/base/src/nsString.cpp
@@ -468,7 +468,8 @@ void nsString::ToUCS2(PRInt32 aStartOffset){
     chartype* end = cp + mLength;
     while (cp < end) {
       unsigned char ch = (unsigned char)*cp;
-      *cp=gToUCS2[ch];
+      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
+        *cp=gToUCS2[ch];
       cp++;
     }
   }
diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index 044f0c8d414..1cdd697d754 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -468,7 +468,8 @@ void nsString::ToUCS2(PRInt32 aStartOffset){
     chartype* end = cp + mLength;
     while (cp < end) {
       unsigned char ch = (unsigned char)*cp;
-      *cp=gToUCS2[ch];
+      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
+        *cp=gToUCS2[ch];
       cp++;
     }
   }
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index 044f0c8d414..1cdd697d754 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -468,7 +468,8 @@ void nsString::ToUCS2(PRInt32 aStartOffset){
     chartype* end = cp + mLength;
     while (cp < end) {
       unsigned char ch = (unsigned char)*cp;
-      *cp=gToUCS2[ch];
+      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
+        *cp=gToUCS2[ch];
       cp++;
     }
   }
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index 044f0c8d414..1cdd697d754 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -468,7 +468,8 @@ void nsString::ToUCS2(PRInt32 aStartOffset){
     chartype* end = cp + mLength;
     while (cp < end) {
       unsigned char ch = (unsigned char)*cp;
-      *cp=gToUCS2[ch];
+      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
+        *cp=gToUCS2[ch];
       cp++;
     }
   }