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

Bug 211116 plugins leak an acrobat hkey

Browse Source 
r=peterl sr=roc+moz


git-svn-id: svn://10.0.0.236/trunk@144359 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2003-07-01 21:40:29 +00:00
parent 2b8917ec51
commit 61b7d6f299
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
View File

@ -281,9 +281,11 @@ nsPluginDirServiceProvider::GetFile(const char *prop, PRBool *persistant, nsIFil
newestPath[0] = 0;
LONG result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, curKey, 0, KEY_READ, &baseloc);
if (ERROR_SUCCESS != result)
return NS_ERROR_FAILURE;
// we must enumerate through the keys because what if there is more than one version?
while (ERROR_SUCCESS == result) {
do {
path[0] = 0;
numChars = _MAX_PATH;
pathlen = sizeof(path);
@ -299,11 +301,11 @@ nsPluginDirServiceProvider::GetFile(const char *prop, PRBool *persistant, nsIFil
PL_strcpy(newestPath, path);
CopyVersion(&maxVer, &curVer);
}
::RegCloseKey(keyloc);
}
::RegCloseKey(keyloc);
}
}
}
} while (ERROR_SUCCESS == result);
::RegCloseKey(baseloc);
@ -424,8 +426,8 @@ nsPluginDirServiceProvider::GetFile(const char *prop, PRBool *persistant, nsIFil
PL_strcpy(newestPath, path);
CopyVersion(&maxVer, &curVer);
}
::RegCloseKey(keyloc);
}
::RegCloseKey(keyloc);
}
}
}
@ -439,7 +441,7 @@ nsPluginDirServiceProvider::GetFile(const char *prop, PRBool *persistant, nsIFil
#endif
if (localFile && NS_SUCCEEDED(rv))
return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval);
return CallQueryInterface(localFile, _retval);
return rv;
}
@ -458,9 +460,11 @@ nsPluginDirServiceProvider::GetPLIDDirectories(nsISimpleEnumerator **aEnumerator
char curKey[_MAX_PATH] = "Software\\MozillaPlugins";
LONG result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, curKey, 0, KEY_READ, &baseloc);
if (ERROR_SUCCESS != result)
return NS_ERROR_FAILURE;
DWORD index = 0;
while (ERROR_SUCCESS == result) {
do {
DWORD numChars = _MAX_PATH;
FILETIME modTime;
DWORD type;
@ -508,7 +512,7 @@ nsPluginDirServiceProvider::GetPLIDDirectories(nsISimpleEnumerator **aEnumerator
}
::RegCloseKey(keyloc);
}
}
} while (ERROR_SUCCESS == result);
::RegCloseKey(baseloc);