Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some crashes where it wa assumes mStr was non-NULL

Browse Source
This commit is contained in:
troy%netscape.com 1998-07-30 20:36:51 +00:00
parent d0afc21169
commit e2bf4445ea
4 changed files with 88 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
base/src/nsString.cpp
View File

@ -623,7 +623,13 @@ nsString& nsString::operator=(char aChar) {
* @return this
*------------------------------------------------------*/
nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
if(aStr!=0) {
if((0 == aLength) || (nsnull == aStr)) {
mLength=0;
if (nsnull != mStr) {
mStr[0]=0;
}
} else {
PRInt32 len=(kNotFound==aLength) ? nsCRT::strlen(aStr) : aLength;
if(mCapacity< len )
EnsureCapacityFor(len);
@ -631,13 +637,7 @@ nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
mLength=len;
mStr[mLength]=0;
}
else {
mLength=0; //This little bit of code handles the case
//where some blockhead hands us a null string
if (nsnull != mStr) {
mStr[0]=0;
}
}
return *this;
}
@ -1512,8 +1512,20 @@ PRInt32 nsString::operator>=(const PRUnichar *s) const {return Compare(s)==0;}
* @return TRUE if equal
*------------------------------------------------------*/
PRBool nsString::Equals(const nsString& aString) const {
PRInt32 result=nsCRT::strcmp(mStr,aString.mStr);
return PRBool(0==result);
PRBool result;
if (mLength != aString.mLength) {
result = PR_FALSE;
} else if (0 == mLength) {
result = PR_TRUE;
} else {
result = (0 == nsCRT::strcmp(mStr,aString.mStr));
}
return result;
}

32
string/obsolete/nsString.cpp
View File

@ -623,7 +623,13 @@ nsString& nsString::operator=(char aChar) {
* @return this
*------------------------------------------------------*/
nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
if(aStr!=0) {
if((0 == aLength) || (nsnull == aStr)) {
mLength=0;
if (nsnull != mStr) {
mStr[0]=0;
}
} else {
PRInt32 len=(kNotFound==aLength) ? nsCRT::strlen(aStr) : aLength;
if(mCapacity< len )
EnsureCapacityFor(len);
@ -631,13 +637,7 @@ nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
mLength=len;
mStr[mLength]=0;
}
else {
mLength=0; //This little bit of code handles the case
//where some blockhead hands us a null string
if (nsnull != mStr) {
mStr[0]=0;
}
}
return *this;
}
@ -1512,8 +1512,20 @@ PRInt32 nsString::operator>=(const PRUnichar *s) const {return Compare(s)==0;}
* @return TRUE if equal
*------------------------------------------------------*/
PRBool nsString::Equals(const nsString& aString) const {
PRInt32 result=nsCRT::strcmp(mStr,aString.mStr);
return PRBool(0==result);
PRBool result;
if (mLength != aString.mLength) {
result = PR_FALSE;
} else if (0 == mLength) {
result = PR_TRUE;
} else {
result = (0 == nsCRT::strcmp(mStr,aString.mStr));
}
return result;
}

32
xpcom/ds/nsString.cpp
View File

@ -623,7 +623,13 @@ nsString& nsString::operator=(char aChar) {
* @return this
*------------------------------------------------------*/
nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
if(aStr!=0) {
if((0 == aLength) || (nsnull == aStr)) {
mLength=0;
if (nsnull != mStr) {
mStr[0]=0;
}
} else {
PRInt32 len=(kNotFound==aLength) ? nsCRT::strlen(aStr) : aLength;
if(mCapacity< len )
EnsureCapacityFor(len);
@ -631,13 +637,7 @@ nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
mLength=len;
mStr[mLength]=0;
}
else {
mLength=0; //This little bit of code handles the case
//where some blockhead hands us a null string
if (nsnull != mStr) {
mStr[0]=0;
}
}
return *this;
}
@ -1512,8 +1512,20 @@ PRInt32 nsString::operator>=(const PRUnichar *s) const {return Compare(s)==0;}
* @return TRUE if equal
*------------------------------------------------------*/
PRBool nsString::Equals(const nsString& aString) const {
PRInt32 result=nsCRT::strcmp(mStr,aString.mStr);
return PRBool(0==result);
PRBool result;
if (mLength != aString.mLength) {
result = PR_FALSE;
} else if (0 == mLength) {
result = PR_TRUE;
} else {
result = (0 == nsCRT::strcmp(mStr,aString.mStr));
}
return result;
}

32
xpcom/string/obsolete/nsString.cpp
View File

@ -623,7 +623,13 @@ nsString& nsString::operator=(char aChar) {
* @return this
*------------------------------------------------------*/
nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
if(aStr!=0) {
if((0 == aLength) || (nsnull == aStr)) {
mLength=0;
if (nsnull != mStr) {
mStr[0]=0;
}
} else {
PRInt32 len=(kNotFound==aLength) ? nsCRT::strlen(aStr) : aLength;
if(mCapacity< len )
EnsureCapacityFor(len);
@ -631,13 +637,7 @@ nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
mLength=len;
mStr[mLength]=0;
}
else {
mLength=0; //This little bit of code handles the case
//where some blockhead hands us a null string
if (nsnull != mStr) {
mStr[0]=0;
}
}
return *this;
}
@ -1512,8 +1512,20 @@ PRInt32 nsString::operator>=(const PRUnichar *s) const {return Compare(s)==0;}
* @return TRUE if equal
*------------------------------------------------------*/
PRBool nsString::Equals(const nsString& aString) const {
PRInt32 result=nsCRT::strcmp(mStr,aString.mStr);
return PRBool(0==result);
PRBool result;
if (mLength != aString.mLength) {
result = PR_FALSE;
} else if (0 == mLength) {
result = PR_TRUE;
} else {
result = (0 == nsCRT::strcmp(mStr,aString.mStr));
}
return result;
}