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

#78014. Fix some leaks in plugin init code. r=bbaetz@cs.mcgill.ca, ra=av@netscape.com, sr=blizzard@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@93644 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hwaara%chello.se
2001-05-02 14:45:59 +00:00
parent 808d12572d
commit 3afe379e14
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -19,6 +19,7 @@
*
* Contributor(s):
* Sean Echevarria <sean@beatnik.com>
* Håkan Waara <hwaara@chello.se>
*/
#include "nsPluginHostImpl.h"
@@ -3396,8 +3397,8 @@ static PRBool areTheSameFileNames(char * aPath1, char * aPath2)
nsresult rv = NS_OK;
char * filename1 = nsnull;
char * filename2 = nsnull;
nsXPIDLCString filename1;
nsXPIDLCString filename2;
nsCOMPtr<nsILocalFile> file1;
nsCOMPtr<nsILocalFile> file2;
@@ -3410,15 +3411,15 @@ static PRBool areTheSameFileNames(char * aPath1, char * aPath2)
if(NS_FAILED(rv))
return PR_FALSE;
file1->GetLeafName(&filename1);
file2->GetLeafName(&filename2);
file1->GetLeafName(getter_Copies(filename1));
file2->GetLeafName(getter_Copies(filename2));
if(PL_strlen(filename1) != PL_strlen(filename2))
if(PL_strlen(filename1.get()) != PL_strlen(filename2.get()))
return PR_FALSE;
// XXX this one MUST be case insensitive for Windows and MUST be case
// sensitive for Unix. How about Win2000?
return (nsnull == PL_strncasecmp(filename1, filename2, PL_strlen(filename1)));
return (nsnull == PL_strncasecmp(filename1.get(), filename2.get(), PL_strlen(filename1.get())));
}
static PRBool isJavaPlugin(nsPluginTag * tag)

13
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -19,6 +19,7 @@
*
* Contributor(s):
* Sean Echevarria <sean@beatnik.com>
* Håkan Waara <hwaara@chello.se>
*/
#include "nsPluginHostImpl.h"
@@ -3396,8 +3397,8 @@ static PRBool areTheSameFileNames(char * aPath1, char * aPath2)
nsresult rv = NS_OK;
char * filename1 = nsnull;
char * filename2 = nsnull;
nsXPIDLCString filename1;
nsXPIDLCString filename2;
nsCOMPtr<nsILocalFile> file1;
nsCOMPtr<nsILocalFile> file2;
@@ -3410,15 +3411,15 @@ static PRBool areTheSameFileNames(char * aPath1, char * aPath2)
if(NS_FAILED(rv))
return PR_FALSE;
file1->GetLeafName(&filename1);
file2->GetLeafName(&filename2);
file1->GetLeafName(getter_Copies(filename1));
file2->GetLeafName(getter_Copies(filename2));
if(PL_strlen(filename1) != PL_strlen(filename2))
if(PL_strlen(filename1.get()) != PL_strlen(filename2.get()))
return PR_FALSE;
// XXX this one MUST be case insensitive for Windows and MUST be case
// sensitive for Unix. How about Win2000?
return (nsnull == PL_strncasecmp(filename1, filename2, PL_strlen(filename1)));
return (nsnull == PL_strncasecmp(filename1.get(), filename2.get(), PL_strlen(filename1.get())));
}
static PRBool isJavaPlugin(nsPluginTag * tag)