Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing bug #8454 and AddDirectory() function

Browse Source
This commit is contained in:
ssu%netscape.com 1999-06-29 23:15:38 +00:00
parent e4ba4e0477
commit c8f96624ed
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xpinstall/src/nsInstall.cpp
View File

@ -41,6 +41,7 @@
#include "nsIPref.h"
#include "prmem.h"
#include "plstr.h"
#include "VerReg.h"
//#include "zipfile.h" // replaced by nsIJAR.h
@ -1787,8 +1788,8 @@ nsInstall::ExtractDirEntries(const nsString& directory, nsVector *paths)
if ( paths )
{
nsString pattern(directory);
pattern += "/?*";
PRInt32 prefix_length = directory.Length();
pattern += "/*";
PRInt32 prefix_length = directory.Length()+1; // account for slash
nsresult rv = mJarFileData->Find( nsAutoCString(pattern), &jarEnum );
if (NS_FAILED(rv) || !jarEnum)
@ -1796,10 +1797,7 @@ nsInstall::ExtractDirEntries(const nsString& directory, nsVector *paths)
PRBool bMore;
rv = jarEnum->HasMoreElements(&bMore);
if (NS_FAILED(rv))
goto handle_err;
while (bMore)
while (bMore && NS_SUCCEEDED(rv))
{
rv = jarEnum->GetNext( (nsISupports**) &currJARItem );
if (currJARItem)
@ -1810,19 +1808,19 @@ nsInstall::ExtractDirEntries(const nsString& directory, nsVector *paths)
goto handle_err;
if (buf)
{
if ( prefix_length >= sizeof(buf)-1 )
PRInt32 namelen = PL_strlen(buf);
NS_ASSERTION( prefix_length <= namelen, "Match must be longer than pattern!" );
if ( buf[namelen-1] != '/' )
{
PR_FREEIF( buf );
goto handle_err;
paths->Add( new nsString(buf+prefix_length) ); // XXX manipulation should be in caller
}
paths->Add( new nsString(buf+prefix_length) ); // XXX manipulation should be in caller
PR_FREEIF( buf );
}
NS_IF_RELEASE(currJARItem);
}
rv = jarEnum->HasMoreElements(&bMore);
if (NS_FAILED(rv))
goto handle_err;
}
}

2
xpinstall/src/nsInstallFile.cpp
View File

@ -105,7 +105,7 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
}
}
delete qualifiedRegNameString;
delete [] qualifiedRegNameString;
mFinalFile = new nsFileSpec(folderSpec);