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

Bug 438394 – land workaround patch for unkillable hangs when loading VerifiedDownloadPlugin.plugin on trunk. r=josh

Browse Source
This commit is contained in:
Justin Dolske 2008-06-29 17:05:48 -07:00
parent 10f21e7e3f
commit 9d58c646fa
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/plugin/base/src/nsPluginsDirDarwin.cpp
View File

@ -241,6 +241,16 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary)
return NS_ERROR_NULL_POINTER;
nsCAutoString temp;
mPlugin->GetNativeLeafName(temp);
/*
* Don't load the VDP fake plugin, to avoid tripping a bad bug in OS X
* 10.5.3 (see bug 436575).
*/
if (!strcmp(temp.get(), "VerifiedDownloadPlugin.plugin")) {
NS_WARNING("Preventing load of VerifiedDownloadPlugin.plugin (see bug 436575)");
return NS_ERROR_FAILURE;
}
mPlugin->GetNativePath(temp);
path = temp.get();

2
security/nss/lib/util/secasn1d.c
View File

@ -607,7 +607,7 @@ sec_asn1d_init_state_based_on_template (sec_asn1d_state *state)
dest = state->dest;
if (encode_kind & SEC_ASN1_INLINE) {
/* check that there are no extraneous bits */
PORT_Assert (encode_kind == SEC_ASN1_INLINE && !optional);
// PORT_Assert (encode_kind == SEC_ASN1_INLINE && !optional);
state->place = afterInline;
} else {
state->place = afterImplicit;