diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp index f9cfd88b616..58f9d66b8a7 100644 --- a/mozilla/string/obsolete/nsString.cpp +++ b/mozilla/string/obsolete/nsString.cpp @@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) { diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index 6c493207eab..cd49a01279d 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) { diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp index f9cfd88b616..58f9d66b8a7 100644 --- a/mozilla/xpcom/ds/nsString.cpp +++ b/mozilla/xpcom/ds/nsString.cpp @@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) { diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index 6c493207eab..cd49a01279d 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) { diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp index f9cfd88b616..58f9d66b8a7 100644 --- a/mozilla/xpcom/string/obsolete/nsString.cpp +++ b/mozilla/xpcom/string/obsolete/nsString.cpp @@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) { diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index 6c493207eab..cd49a01279d 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const { } //switch } + theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix; + //if you don't have any valid chars, return 0, but set the error; if(cp<=endcp) {