From e71f300fd78e55a5c94630147a0b7cf83ea5f2f9 Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 25 Apr 1999 01:51:21 +0000
Subject: [PATCH] fix to nsString2 constructor

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

diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp
index c661c7b27ef..44922f0d55a 100644
--- a/mozilla/base/src/nsString2.cpp
+++ b/mozilla/base/src/nsString2.cpp
@@ -2038,7 +2038,8 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   aCString is a ptr to a 1-byte cstr
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
+  eCharSize theSize=(eCharSize)aStr.mMultibyte;
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index c661c7b27ef..44922f0d55a 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -2038,7 +2038,8 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   aCString is a ptr to a 1-byte cstr
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
+  eCharSize theSize=(eCharSize)aStr.mMultibyte;
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index c661c7b27ef..44922f0d55a 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -2038,7 +2038,8 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   aCString is a ptr to a 1-byte cstr
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
+  eCharSize theSize=(eCharSize)aStr.mMultibyte;
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index c661c7b27ef..44922f0d55a 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -2038,7 +2038,8 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   aCString is a ptr to a 1-byte cstr
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
+  eCharSize theSize=(eCharSize)aStr.mMultibyte;
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);