Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix badness when nsFilePath is initialized with a nil or empty string.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@31310 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcmullen%netscape.com 1999-05-12 22:56:24 +00:00
parent 5bfaa2834f
commit bf928cd741
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/base/src/nsFileSpec.cpp
View File

@ -615,6 +615,9 @@ nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
//----------------------------------------------------------------------------------------
: mPath(inString)
{
if (mPath.IsEmpty())
return;
NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
#ifdef XP_PC
@ -635,8 +638,10 @@ nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
//----------------------------------------------------------------------------------------
: mPath(inString)
{
NS_ASSERTION(strstr((const char*)mPath, kFileURLPrefix) != (const char*)mPath, "URL passed as path");
if (mPath.IsEmpty())
return;
NS_ASSERTION(strstr((const char*)mPath, kFileURLPrefix) != (const char*)mPath, "URL passed as path");
#ifdef XP_PC
nsFileSpecHelpers::UnixToNative(mPath);
#endif
@ -688,8 +693,11 @@ void nsFilePath::operator = (const nsFileSpec& inOther)
void nsFilePath::operator = (const char* inString)
//----------------------------------------------------------------------------------------
{
NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
mPath = inString;
if (mPath.IsEmpty())
return;
#ifdef XP_PC
nsFileSpecHelpers::UnixToNative(mPath);
#endif

10
mozilla/xpcom/io/nsFileSpec.cpp
View File

@ -615,6 +615,9 @@ nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
//----------------------------------------------------------------------------------------
: mPath(inString)
{
if (mPath.IsEmpty())
return;
NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
#ifdef XP_PC
@ -635,8 +638,10 @@ nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
//----------------------------------------------------------------------------------------
: mPath(inString)
{
NS_ASSERTION(strstr((const char*)mPath, kFileURLPrefix) != (const char*)mPath, "URL passed as path");
if (mPath.IsEmpty())
return;
NS_ASSERTION(strstr((const char*)mPath, kFileURLPrefix) != (const char*)mPath, "URL passed as path");
#ifdef XP_PC
nsFileSpecHelpers::UnixToNative(mPath);
#endif
@ -688,8 +693,11 @@ void nsFilePath::operator = (const nsFileSpec& inOther)
void nsFilePath::operator = (const char* inString)
//----------------------------------------------------------------------------------------
{
NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
mPath = inString;
if (mPath.IsEmpty())
return;
#ifdef XP_PC
nsFileSpecHelpers::UnixToNative(mPath);
#endif