Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reenabled safer version of assertion

Browse Source
This commit is contained in:
rickg%netscape.com 1999-11-15 17:10:06 +00:00
parent a45e164ae6
commit 516adaef6c
6 changed files with 42 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
string/obsolete/nsString.cpp
View File

@ -795,10 +795,8 @@ nsCString& nsCString::Assign(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Assign(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Assign(PRUnichar*)");
#endif
}
@ -905,10 +903,8 @@ nsCString& nsCString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
else aCount=temp.mLength=nsCRT::strlen(aCString);
@ -1094,10 +1090,8 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}

24
string/obsolete/nsString2.cpp
View File

@ -1044,10 +1044,8 @@ nsString& nsString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
@ -1078,10 +1076,8 @@ nsString& nsString::Append(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(PRUnichar*)");
#endif
}
@ -1270,10 +1266,8 @@ nsString& nsString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}
@ -1307,10 +1301,8 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(PRUnichar*)");
#endif
}

18
xpcom/ds/nsString.cpp
View File

@ -795,10 +795,8 @@ nsCString& nsCString::Assign(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Assign(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Assign(PRUnichar*)");
#endif
}
@ -905,10 +903,8 @@ nsCString& nsCString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
else aCount=temp.mLength=nsCRT::strlen(aCString);
@ -1094,10 +1090,8 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}

24
xpcom/ds/nsString2.cpp
View File

@ -1044,10 +1044,8 @@ nsString& nsString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
@ -1078,10 +1076,8 @@ nsString& nsString::Append(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(PRUnichar*)");
#endif
}
@ -1270,10 +1266,8 @@ nsString& nsString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}
@ -1307,10 +1301,8 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(PRUnichar*)");
#endif
}

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

@ -795,10 +795,8 @@ nsCString& nsCString::Assign(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Assign(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Assign(PRUnichar*)");
#endif
}
@ -905,10 +903,8 @@ nsCString& nsCString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
else aCount=temp.mLength=nsCRT::strlen(aCString);
@ -1094,10 +1090,8 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}

24
xpcom/string/obsolete/nsString2.cpp
View File

@ -1044,10 +1044,8 @@ nsString& nsString::Append(const char* aCString,PRInt32 aCount) {
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(char*)");
#endif
}
@ -1078,10 +1076,8 @@ nsString& nsString::Append(const PRUnichar* aString,PRInt32 aCount) {
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in append(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in append(PRUnichar*)");
#endif
}
@ -1270,10 +1266,8 @@ nsString& nsString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=strlen(aCString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(char*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(char*)");
#endif
}
@ -1307,10 +1301,8 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
// If this assertion fires, the caller is probably lying about the length of
// the passed-in string. File a bug on the caller.
#ifdef NS_DEBUG
#if 0
PRInt32 len=nsCRT::strlen(aString);
NS_WARN_IF_FALSE(len>=aCount,"possible embedded null in Insert(PRUnichar*)");
#endif
PRInt32 len=nsStr::FindChar(temp,0,PR_FALSE,0);
NS_WARN_IF_FALSE(kNotFound==len,"possible embedded null in Insert(PRUnichar*)");
#endif
}