69139 2011-09-30 01:30:12 -0700 [UNIX] Add a method to get information for an already loaded plugin module 2011-09-30 07:22:52 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk, Qt P2 Normal --- 69123 1 cgarcia webkit-unassigned andersca oldest_to_newest 475973 0 cgarcia 2011-09-30 01:30:12 -0700 NetscapePluginModule::getPluginInfo() crashes when called from determineQuirks(). The problem is that determineQuirks() is called when loading a plugin module. Since getPluginInfo() is a static method, when called from determineQuirks() it tries to get or load the plugin module again, the module is now loaded but determineQuirks is called again recursively. A solution to this problem could be adding a private method to get the plugin info for a module already loaded that can be called from determineQuirks. 475977 1 109265 cgarcia 2011-09-30 01:36:56 -0700 Created attachment 109265 Patch 476065 2 109265 mrobinson 2011-09-30 06:44:57 -0700 Comment on attachment 109265 Patch Instead of adding getPluginInfo along with pluginInfo, I think it would be safer to ensure that getPluginInfo is safe to call at any time. I say this because it seems to work on Windows and Mac. If the other ports are making that assumption we should try to match it. 476071 3 cgarcia 2011-09-30 07:01:13 -0700 Other ports don't need to call NetscapePluginModule::getOrCreate() in getPluginInfo(), they use the plugin path directly. We need load the module to get the information. 476078 4 109265 mrobinson 2011-09-30 07:12:35 -0700 Comment on attachment 109265 Patch Hrm. I took another look and I think your method is cleaner than adapting getPluginInfo to allow recursive calls. I think the danger of that happening is pretty low. 476081 5 cgarcia 2011-09-30 07:22:52 -0700 Committed r96400: <http://trac.webkit.org/changeset/96400> 109265 2011-09-30 01:36:56 -0700 2011-09-30 07:12:35 -0700 Patch wk2-plugin-info-crash.diff text/plain 4922 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNTViOTEzLi5kY2NmOWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDktMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtVTklYXSBBZGQgYSBtZXRob2QgdG8gZ2V0IGluZm9ybWF0aW9uIGZvciBh biBhbHJlYWR5IGxvYWRlZCBwbHVnaW4gbW9kdWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTEzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW5Nb2R1bGUuaDogQWRkIHBsdWdpbkluZm8oKS4KKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lu cy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6cGx1Z2luSW5mbyk6IFByaXZhdGUgbWV0aG9kIHRv IGdldAorICAgICAgICB0aGUgcGx1Z2luIGluZm9ybWF0aW9uIGZyb20gdGhlIG1vZHVsZSwgaXQg bXVzdCBiZSBjYWxsZWQgd2hlbiB0aGUKKyAgICAgICAgbW9kdWxlIGhhcyBiZWVuIGFscmVhZHkg aW5pdGlhbGl6ZWQuCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQ bHVnaW5JbmZvKTogVXNlIHBsdWdpbkluZm8oKSB0bworICAgICAgICBnZXQgaW5mb3JtYXRpb24g b2YgdGhlIHBsdWdpbiBtb2R1bGUgZm9yIHRoZSBnaXZlbiBwYXRoLgorCiAyMDExLTA5LTI5ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XSBGb3JjZSBzaW5nbGUgaGVhZGVyIGluY2x1ZGUgaW4gV2ViS2l0MiBHVEsrIEFQSQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVn aW5Nb2R1bGUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luTW9kdWxlLmgKaW5kZXggZWQ2ZjE4Mi4uMDhkODc0MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5Nb2R1bGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBs dWdpbk1vZHVsZS5oCkBAIC02OSw2ICs2OSw3IEBAIHByaXZhdGU6CiAjaWYgUExVR0lOX0FSQ0hJ VEVDVFVSRShYMTEpCiAgICAgdm9pZCBhcHBseVgxMVF1aXJrc0JlZm9yZUxvYWQoKTsKICAgICBz dGF0aWMgdm9pZCBzZXRNSU1FRGVzY3JpcHRpb24oY29uc3QgU3RyaW5nJiBtaW1lRGVzY3JpcHRp b24sIFBsdWdpbk1vZHVsZUluZm8mKTsKKyAgICBib29sIHBsdWdpbkluZm8oUGx1Z2luTW9kdWxl SW5mbyYpOwogI2VuZGlmCiAKICAgICBib29sIHRyeUdldFNpdGVzV2l0aERhdGEoVmVjdG9yPFN0 cmluZz4mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNj YXBlL3gxMS9OZXRzY2FwZVBsdWdpbk1vZHVsZVgxMS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwCmluZGV4 IGI2MGE1MzYzLi4yM2YzODRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1 Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpbk1vZHVs ZVgxMS5jcHAKQEAgLTExOCwzNSArMTE4LDIxIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6 OnNldE1JTUVEZXNjcmlwdGlvbihjb25zdCBTdHJpbmcmIG1pbWVEZXNjcmlwdGlvbiwgUGx1CiAg ICAgfQogfQogCi1ib29sIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQbHVnaW5JbmZvKGNvbnN0 IFN0cmluZyYgcGx1Z2luUGF0aCwgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luKQorYm9vbCBOZXRz Y2FwZVBsdWdpbk1vZHVsZTo6cGx1Z2luSW5mbyhQbHVnaW5Nb2R1bGVJbmZvJiBwbHVnaW4pCiB7 Ci0gICAgLy8gVGVtcGFyYXJpbHkgc3VwcHJlc3Mgc3Rkb3V0IGluIHRoaXMgZnVuY3Rpb24gYXMg cGx1Z2lucyB3aWxsIGJlIGxvYWRlZCBhbmQgc2h1dGRvd24gYW5kIGRlYnVnIGluZm8KLSAgICAv LyBpcyBsZWFrZWQgdG8gbGF5b3V0IHRlc3Qgb3V0cHV0LgotICAgIFN0ZG91dERldk51bGxSZWRp cmVjdG9yIHN0ZG91dERldk51bGxSZWRpcmVjdG9yOwotCi0gICAgLy8gV2UgYXJlIGxvYWRpbmcg dGhlIHBsdWdpbiBoZXJlIHNpbmNlIGl0IGRvZXMgbm90IHNlZW0gdG8gYmUgYSBzdGFuZGFyZGl6 ZWQgd2F5IHRvCi0gICAgLy8gZ2V0IHRoZSBuZWVkZWQgaW5mb3JtYXRpb25zIGZyb20gYSBVTklY IHBsdWdpbiB3aXRob3V0IGxvYWRpbmcgaXQuCi0gICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luTW9k dWxlPiBwbHVnaW5Nb2R1bGUgPSBOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Z2V0T3JDcmVhdGUocGx1 Z2luUGF0aCk7Ci0gICAgaWYgKCFwbHVnaW5Nb2R1bGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIHBsdWdpbk1vZHVsZS0+aW5jcmVtZW50TG9hZENvdW50KCk7CisgICAgQVNTRVJUKG1f aXNJbml0aWFsaXplZCk7CiAKLSAgICBwbHVnaW4ucGF0aCA9IHBsdWdpblBhdGg7Ci0gICAgcGx1 Z2luLmluZm8uZmlsZSA9IHBhdGhHZXRGaWxlTmFtZShwbHVnaW5QYXRoKTsKKyAgICBwbHVnaW4u cGF0aCA9IG1fcGx1Z2luUGF0aDsKKyAgICBwbHVnaW4uaW5mby5maWxlID0gcGF0aEdldEZpbGVO YW1lKG1fcGx1Z2luUGF0aCk7CiAKLSAgICBNb2R1bGUqIG1vZHVsZSA9IHBsdWdpbk1vZHVsZS0+ bW9kdWxlKCk7CisgICAgTW9kdWxlKiBtb2R1bGUgPSBtX21vZHVsZS5nZXQoKTsKICAgICBOUFBf R2V0VmFsdWVQcm9jUHRyIE5QUF9HZXRWYWx1ZSA9IG1vZHVsZS0+ZnVuY3Rpb25Qb2ludGVyPE5Q UF9HZXRWYWx1ZVByb2NQdHI+KCJOUF9HZXRWYWx1ZSIpOwotICAgIGlmICghTlBQX0dldFZhbHVl KSB7Ci0gICAgICAgIHBsdWdpbk1vZHVsZS0+ZGVjcmVtZW50TG9hZENvdW50KCk7CisgICAgaWYg KCFOUFBfR2V0VmFsdWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CiAKICAgICBOUF9H ZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyIE5QX0dldE1JTUVEZXNjcmlwdGlvbiA9IG1vZHVsZS0+ ZnVuY3Rpb25Qb2ludGVyPE5QX0dldE1JTUVEZXNjcmlwdGlvbkZ1bmNQdHI+KCJOUF9HZXRNSU1F RGVzY3JpcHRpb24iKTsKLSAgICBpZiAoIU5QX0dldE1JTUVEZXNjcmlwdGlvbikgewotICAgICAg ICBwbHVnaW5Nb2R1bGUtPmRlY3JlbWVudExvYWRDb3VudCgpOworICAgIGlmICghTlBfR2V0TUlN RURlc2NyaXB0aW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQogCiAgICAgY2hhciog YnVmZmVyOwogICAgIE5QRXJyb3IgZXJyb3IgPSBOUFBfR2V0VmFsdWUoMCwgTlBQVnBsdWdpbk5h bWVTdHJpbmcsICZidWZmZXIpOwpAQCAtMTU4LDE2ICsxNDQsMzAgQEAgYm9vbCBOZXRzY2FwZVBs dWdpbk1vZHVsZTo6Z2V0UGx1Z2luSW5mbyhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBsdWdp bk1vZHVsZUkKICAgICAgICAgcGx1Z2luLmluZm8uZGVzYyA9IGJ1ZmZlcjsKIAogICAgIGNvbnN0 IGNoYXIqIG1pbWVEZXNjcmlwdGlvbiA9IE5QX0dldE1JTUVEZXNjcmlwdGlvbigpOwotICAgIGlm ICghbWltZURlc2NyaXB0aW9uKSB7Ci0gICAgICAgIHBsdWdpbk1vZHVsZS0+ZGVjcmVtZW50TG9h ZENvdW50KCk7CisgICAgaWYgKCFtaW1lRGVzY3JpcHRpb24pCiAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICB9CiAKICAgICBzZXRNSU1FRGVzY3JpcHRpb24obWltZURlc2NyaXB0aW9uLCBwbHVn aW4pOwogCisgICAgcmV0dXJuIHRydWU7Cit9Citib29sIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpn ZXRQbHVnaW5JbmZvKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGx1Z2luTW9kdWxlSW5mbyYg cGx1Z2luKQoreworICAgIC8vIFRlbXBhcmFyaWx5IHN1cHByZXNzIHN0ZG91dCBpbiB0aGlzIGZ1 bmN0aW9uIGFzIHBsdWdpbnMgd2lsbCBiZSBsb2FkZWQgYW5kIHNodXRkb3duIGFuZCBkZWJ1ZyBp bmZvCisgICAgLy8gaXMgbGVha2VkIHRvIGxheW91dCB0ZXN0IG91dHB1dC4KKyAgICBTdGRvdXRE ZXZOdWxsUmVkaXJlY3RvciBzdGRvdXREZXZOdWxsUmVkaXJlY3RvcjsKKworICAgIC8vIFdlIGFy ZSBsb2FkaW5nIHRoZSBwbHVnaW4gaGVyZSBzaW5jZSBpdCBkb2VzIG5vdCBzZWVtIHRvIGJlIGEg c3RhbmRhcmRpemVkIHdheSB0bworICAgIC8vIGdldCB0aGUgbmVlZGVkIGluZm9ybWF0aW9ucyBm cm9tIGEgVU5JWCBwbHVnaW4gd2l0aG91dCBsb2FkaW5nIGl0LgorICAgIFJlZlB0cjxOZXRzY2Fw ZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlID0gTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmdldE9y Q3JlYXRlKHBsdWdpblBhdGgpOworICAgIGlmICghcGx1Z2luTW9kdWxlKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICBwbHVnaW5Nb2R1bGUtPmluY3JlbWVudExvYWRDb3VudCgpOworICAg IGJvb2wgcmV0dXJuVmFsdWUgPSBwbHVnaW5Nb2R1bGUtPnBsdWdpbkluZm8ocGx1Z2luKTsKICAg ICBwbHVnaW5Nb2R1bGUtPmRlY3JlbWVudExvYWRDb3VudCgpOwogCi0gICAgcmV0dXJuIHRydWU7 CisgICAgcmV0dXJuIHJldHVyblZhbHVlOwogfQogCiB2b2lkIE5ldHNjYXBlUGx1Z2luTW9kdWxl OjpkZXRlcm1pbmVRdWlya3MoKQo=