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

Fix a bug where we would attempt to execute c:\autoexec.bat, which is a bad thing

Browse Source
This commit is contained in:
blythe 1998-06-03 00:23:00 +00:00
parent c5bab4a898
commit 92dbbbf020
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/winfe/feutil.cpp
View File

@ -2219,7 +2219,15 @@ BOOL FEU_FindExecutable(const char *pFileName, char *pExecutable, BOOL bIdentity
// pFileName may not be a file name, but an extension.
// We want to support just extensions for ease, so check on it.
if(bExtension && pFileName) {
// We have an extension.
// Do we need to add a period?
char aExt[_MAX_EXT];
if(*pFileName != '.') {
aExt[0] = '.';
aExt[1] = '\0';
strcat(aExt, pFileName);
pFileName = aExt;
}
// Fill out the rest of the name.
bFreeFileName = TRUE;
pFileName = (const char *)WH_TempFileName(xpTemporary, "G", pFileName);

28
cmd/winfe/helpers.cpp
View File

@ -378,23 +378,6 @@ char *InventDescription(const char *pExtension)
return NULL;
}
static BOOL
HasShellOpenCommand(LPCSTR lpszFileClass)
{
char szKey[_MAX_PATH];
HKEY hKey;
// See if there's a shell/open key specified for the file class
PR_snprintf(szKey, sizeof(szKey), "%s\\shell\\open", lpszFileClass);
if (RegOpenKey(HKEY_CLASSES_ROOT, szKey, &hKey) == ERROR_SUCCESS) {
RegCloseKey(hKey);
return TRUE;
}
return FALSE;
}
// Create a front-end data structure if necessary, and set how_handle as
// HANDLE_SHELLEXECUTE if there's a shell\open command for the file extension.
// It will also set the description if there isn't already one
@ -421,13 +404,20 @@ void ShellHelper(NET_cdataStruct *pNet, const char *pExtension)
if (GetClassName(pExtension, pApp->strFileClass)) {
// XXX - We really should handle verbs other than Open. FindExecutable()
// and ShellExecute() don't either, but ShellExecuteEx() does...
if (HasShellOpenCommand((LPCSTR)pApp->strFileClass)) {
char aExe[_MAX_PATH];
aExe[0] = '\0';
if(FEU_FindExecutable(pExtension, aExe, FALSE, TRUE)) {
pApp->how_handle = HANDLE_SHELLEXECUTE;
pApp->csCmd = MIME_SHELLEXECUTE;
}
else if(aExe[0]) {
// We reach this only if the extension itself is executable.
// Those that are themselves shellexecutable must save or
// we risk security.
pApp->how_handle = HANDLE_SAVE;
}
}
// application/octet-stream is always save.
if(!stricmp(pNet->ci.type, APPLICATION_OCTET_STREAM)) {
pApp->how_handle = HANDLE_SAVE;