22452 2008-11-24 04:52:29 -0800 Unchecking "Enable plugins" does not have any effect on navigator.plugins 2009-01-16 07:17:57 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sorccu ariya.hidayat andersca ariya.hidayat sam oldest_to_newest 99947 0 sorccu 2008-11-24 04:52:29 -0800 Unlike in Firefox and Opera, a plugin's entry in navigator.plugins and its corresponding mimetype entries in navigator.mimeTypes are set even if plugins are disabled. Internet Explorer is of no concern because of its ActiveX plugin architecture; the aforementioned collections are always empty. Firefox (3.1b1), Flash enabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> Plugin navigator.mimeTypes['application/x-shockwave-flash'] -> MimeType navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> Plugin Firefox (3.1b1), Flash disabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> undefined navigator.mimeTypes['application/x-shockwave-flash'] -> undefined navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> throws TypeError Opera (9.62), Flash enabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> Plugin navigator.mimeTypes['application/x-shockwave-flash'] -> MimeType navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> Plugin Opera (9.62), Flash disabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> undefined navigator.mimeTypes['application/x-shockwave-flash'] -> undefined navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> throws TypeError WebKit r38699, Flash enabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> Plugin navigator.mimeTypes['application/x-shockwave-flash'] -> MimeType navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> Plugin INCONSISTENT: WebKit r38699, Flash disabled: --------------------------------------- navigator.plugins['Shockwave Flash'] -> Plugin navigator.mimeTypes['application/x-shockwave-flash'] -> MimeType navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin -> null 99948 1 mrowe 2008-11-24 04:53:23 -0800 <rdar://problem/6396442> 105900 2 ariya.hidayat 2009-01-15 08:37:59 -0800 *** Bug 23329 has been marked as a duplicate of this bug. *** 105901 3 26758 ariya.hidayat 2009-01-15 08:47:32 -0800 Created attachment 26758 Patch to fix the problem Do not return pluginData if plugins are disabled. 106049 4 26790 ariya.hidayat 2009-01-16 05:11:17 -0800 Created attachment 26790 patch to fix the problem Updated patch, with entry to ChangeLog. 106056 5 26792 ariya.hidayat 2009-01-16 06:42:13 -0800 Created attachment 26792 updated patch, changelog addressing Simon's comment: safeguard some places where pluginData() might return NULL. 106057 6 26792 aroben 2009-01-16 07:07:34 -0800 Comment on attachment 26792 updated patch, changelog r=me 106059 7 ariya.hidayat 2009-01-16 07:17:57 -0800 Landed in r39969. 26758 2009-01-15 08:47:32 -0800 2009-01-16 05:11:17 -0800 Patch to fix the problem webkit-22452-plugin-disabled.diff text/plain 415 ariya.hidayat ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1dlYkNvcmUvcGFnZS9QYWdlLmNw cAppbmRleCA2N2YxMjY2Li40NjAxODNhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKKysrIGIvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0yOTIsNiArMjkyLDggQEAgdm9pZCBQ YWdlOjpyZWZyZXNoUGx1Z2lucyhib29sIHJlbG9hZCkKIAogUGx1Z2luRGF0YSogUGFnZTo6cGx1 Z2luRGF0YSgpIGNvbnN0CiB7CisgICAgaWYgKCFzZXR0aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxl ZCgpKQorICAgICAgICByZXR1cm4gMDsKICAgICBpZiAoIW1fcGx1Z2luRGF0YSkKICAgICAgICAg bV9wbHVnaW5EYXRhID0gUGx1Z2luRGF0YTo6Y3JlYXRlKHRoaXMpOwogICAgIHJldHVybiBtX3Bs dWdpbkRhdGEuZ2V0KCk7Cg== 26790 2009-01-16 05:11:17 -0800 2009-01-16 06:42:13 -0800 patch to fix the problem webkit-22452-disable-plugin.patch text/plain 1750 ariya.hidayat Y29tbWl0IGM4ODFiNWQxYTE1ZjBlMTJhNjY5Y2M1NDBlZWIzNTk0OTA5YjVjNGYKQXV0aG9yOiBB cml5YSBIaWRheWF0IDxhcml5YS5oaWRheWF0QHRyb2xsdGVjaC5jb20+CkRhdGU6ICAgRnJpIEph biAxNiAxMDozODoyNiAyMDA5ICswMTAwCgogICAgMjAwOS0wMS0xNiAgQXJpeWEgSGlkYXlhdCAg PGFyaXlhLmhpZGF5YXRAdHJvbGx0ZWNoLmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTIKICAgIAogICAgICAgICAgICBXaGVuIHBsdWdpbnMgYXJl IGRpc2FibGVkLCBwbHVnaW4gZGF0YSBzaG91bGQgbm90IGJlIGF2YWlsYWJsZSBmb3IKICAgICAg ICAgICAgdGhlIHBhZ2UuIFRoaXMgZW5zdXJlcyB0aGF0IG5hdmlnYXRvci5wbHVnaW5zIHdvdWxk IG5vdCBzZWUgdGhlCiAgICAgICAgICAgIGFkZGl0aW9uYWwgTUlNRSB0eXBlcyBzdXBwb3J0ZWQg YnkgdGhlIHBsdWdpbnMuCiAgICAKICAgICAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgogICAgICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6cGx1Z2luRGF0YSk6CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9D aGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1Y2M5OGRkLi4xOWVlNGMyIDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDA5LTAxLTE2ICBBcml5YSBIaWRheWF0ICA8YXJpeWEuaGlkYXlhdEB0cm9s bHRlY2guY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MgorCisgICAg ICAgIFdoZW4gcGx1Z2lucyBhcmUgZGlzYWJsZWQsIHBsdWdpbiBkYXRhIHNob3VsZCBub3QgYmUg YXZhaWxhYmxlIGZvcgorICAgICAgICB0aGUgcGFnZS4gVGhpcyBlbnN1cmVzIHRoYXQgbmF2aWdh dG9yLnBsdWdpbnMgd291bGQgbm90IHNlZSB0aGUKKyAgICAgICAgYWRkaXRpb25hbCBNSU1FIHR5 cGVzIHN1cHBvcnRlZCBieSB0aGUgcGx1Z2lucy4KKworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpwbHVnaW5EYXRhKToKKwogMjAwOS0wMS0xNiAgRGF2 aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGZvciAxLjg1JSBQTFQg cmVncmVzc2lvbi4gIFNpbmNlIGFza2luZyBpZiBhIGZyYW1lIGlzICJjb21wbGV0ZSIgYWN0dWFs bHkgYWdncmVzc2l2ZWx5IGRlY29kZXMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9QYWdlLmNw cCBiL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA2N2YxMjY2Li40NjAxODNhIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBA IC0yOTIsNiArMjkyLDggQEAgdm9pZCBQYWdlOjpyZWZyZXNoUGx1Z2lucyhib29sIHJlbG9hZCkK IAogUGx1Z2luRGF0YSogUGFnZTo6cGx1Z2luRGF0YSgpIGNvbnN0CiB7CisgICAgaWYgKCFzZXR0 aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gMDsKICAgICBpZiAo IW1fcGx1Z2luRGF0YSkKICAgICAgICAgbV9wbHVnaW5EYXRhID0gUGx1Z2luRGF0YTo6Y3JlYXRl KHRoaXMpOwogICAgIHJldHVybiBtX3BsdWdpbkRhdGEuZ2V0KCk7Cg== 26792 2009-01-16 06:42:13 -0800 2009-01-16 07:07:34 -0800 updated patch, changelog webkit-22452-disable-plugin.patch text/plain 5571 ariya.hidayat Y29tbWl0IDY2MzUwZmFkZTFjNmNmMmM0OGMzYzBhZjk5ZDc0MjUzN2U3NjdjNDMKQXV0aG9yOiBB cml5YSBIaWRheWF0IDxhcml5YS5oaWRheWF0QHRyb2xsdGVjaC5jb20+CkRhdGU6ICAgRnJpIEph biAxNiAxMDozODoyNiAyMDA5ICswMTAwCgogICAgMjAwOS0wMS0xNiAgQXJpeWEgSGlkYXlhdCAg PGFyaXlhLmhpZGF5YXRAdHJvbGx0ZWNoLmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTIKICAgIAogICAgICAgICAgICBXaGVuIHBsdWdpbnMgYXJl IGRpc2FibGVkLCBwbHVnaW4gZGF0YSBzaG91bGQgbm90IGJlIGF2YWlsYWJsZSBmb3IKICAgICAg ICAgICAgdGhlIHBhZ2UuIFRoaXMgZW5zdXJlcyB0aGF0IG5hdmlnYXRvci5wbHVnaW5zIHdvdWxk IG5vdCBzZWUgdGhlCiAgICAgICAgICAgIGFkZGl0aW9uYWwgTUlNRSB0eXBlcyBzdXBwb3J0ZWQg YnkgdGhlIHBsdWdpbnMuCiAgICAKICAgICAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgogICAgICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6cGx1Z2luRGF0YSk6CiAgICAgICAgICAgICogbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcDoKICAgICAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzaG91bGRV c2VQbHVnaW4pOgogICAgICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJQYXJ0T2JqZWN0LmNwcDoK ICAgICAgICAgICAgKFdlYkNvcmU6OlJlbmRlclBhcnRPYmplY3Q6OnVwZGF0ZVdpZGdldCk6CiAg ICAKICAgIDIwMDktMDEtMTYgIEFyaXlhIEhpZGF5YXQgIDxhcml5YS5oaWRheWF0QHRyb2xsdGVj aC5jb20+CiAgICAKICAgICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAK ICAgICAgICAgICAgW1F0XSBQcmV2ZW50IGNyYXNoIGlmIHBsdWdpbiBkYXRhIGlzIE5VTEwuCiAg ICAKICAgICAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDog TlVMTCBjaGVjay4KICAgICAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6Om9i amVjdENvbnRlbnRUeXBlKToKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDg4MGQwYzcuLjJlNTE0YzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDkt MDEtMTYgIEFyaXlhIEhpZGF5YXQgIDxhcml5YS5oaWRheWF0QHRyb2xsdGVjaC5jb20+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUyCisKKyAgICAgICAgV2hlbiBwbHVnaW5z IGFyZSBkaXNhYmxlZCwgcGx1Z2luIGRhdGEgc2hvdWxkIG5vdCBiZSBhdmFpbGFibGUgZm9yCisg ICAgICAgIHRoZSBwYWdlLiBUaGlzIGVuc3VyZXMgdGhhdCBuYXZpZ2F0b3IucGx1Z2lucyB3b3Vs ZCBub3Qgc2VlIHRoZQorICAgICAgICBhZGRpdGlvbmFsIE1JTUUgdHlwZXMgc3VwcG9ydGVkIGJ5 IHRoZSBwbHVnaW5zLgorCisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlBhZ2U6OnBsdWdpbkRhdGEpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2hvdWxkVXNlUGx1Z2luKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyUGFydE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJQYXJ0T2JqZWN0Ojp1cGRhdGVXaWRnZXQpOgorCisyMDA5LTAxLTE2ICBBcml5YSBIaWRh eWF0ICA8YXJpeWEuaGlkYXlhdEB0cm9sbHRlY2guY29tPgorCiAgICAgICAgIEFub3RoZXIgYXR0 ZW1wdCBhdCBmaXhpbmcgdGhlIFF0IGJ1aWxkLgogCiAgICAgICAgICogYnJpZGdlL3F0L3F0X2lu c3RhbmNlLmNwcDoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBi L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkYmI2ZGZhLi5mMzU4MjRhIDEw MDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xNzE4LDcgKzE3MTgsOCBAQCBib29sIEZyYW1lTG9h ZGVyOjpzaG91bGRVc2VQbHVnaW4oY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBib29sCiAgICAgLy8gQWxsb3cgb3RoZXIgcGx1Zy1pbnMgdG8gd2luIG92ZXIgUXVpY2tU aW1lIGJlY2F1c2UgaWYgdGhlIHVzZXIgaGFzIGluc3RhbGxlZCBhIHBsdWctaW4gdGhhdAogICAg IC8vIGNhbiBoYW5kbGUgVElGRiAod2hpY2ggUXVpY2tUaW1lIGNhbiBhbHNvIGhhbmRsZSkgdGhl eSBwcm9iYWJseSBpbnRlbmRlZCB0byBvdmVycmlkZSBRVC4KICAgICBpZiAobV9mcmFtZS0+cGFn ZSgpICYmIChtaW1lVHlwZSA9PSAiaW1hZ2UvdGlmZiIgfHwgbWltZVR5cGUgPT0gImltYWdlL3Rp ZiIgfHwgbWltZVR5cGUgPT0gImltYWdlL3gtdGlmZiIpKSB7Ci0gICAgICAgIFN0cmluZyBwbHVn aW5OYW1lID0gbV9mcmFtZS0+cGFnZSgpLT5wbHVnaW5EYXRhKCktPnBsdWdpbk5hbWVGb3JNaW1l VHlwZShtaW1lVHlwZSk7CisgICAgICAgIGNvbnN0IFBsdWdpbkRhdGEqIHBsdWdpbkRhdGEgPSBt X2ZyYW1lLT5wYWdlKCktPnBsdWdpbkRhdGEoKTsKKyAgICAgICAgU3RyaW5nIHBsdWdpbk5hbWUg PSBwbHVnaW5EYXRhID8gcGx1Z2luRGF0YS0+cGx1Z2luTmFtZUZvck1pbWVUeXBlKG1pbWVUeXBl KSA6IFN0cmluZygpOwogICAgICAgICBpZiAoIXBsdWdpbk5hbWUuaXNFbXB0eSgpICYmICFwbHVn aW5OYW1lLmNvbnRhaW5zKCJRdWlja1RpbWUiLCBmYWxzZSkpIAogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvV2ViQ29y ZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDY3ZjEyNjYuLjQ2MDE4M2EgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGFnZS9QYWdlLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTI5Miw2ICsy OTIsOCBAQCB2b2lkIFBhZ2U6OnJlZnJlc2hQbHVnaW5zKGJvb2wgcmVsb2FkKQogCiBQbHVnaW5E YXRhKiBQYWdlOjpwbHVnaW5EYXRhKCkgY29uc3QKIHsKKyAgICBpZiAoIXNldHRpbmdzKCktPmFy ZVBsdWdpbnNFbmFibGVkKCkpCisgICAgICAgIHJldHVybiAwOwogICAgIGlmICghbV9wbHVnaW5E YXRhKQogICAgICAgICBtX3BsdWdpbkRhdGEgPSBQbHVnaW5EYXRhOjpjcmVhdGUodGhpcyk7CiAg ICAgcmV0dXJuIG1fcGx1Z2luRGF0YS5nZXQoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclBhcnRPYmplY3QuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUGFydE9i amVjdC5jcHAKaW5kZXggMThmYzYwNC4uMTgyNzQ3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUGFydE9iamVjdC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UGFydE9iamVjdC5jcHAKQEAgLTE0MCw3ICsxNDAsNyBAQCB2b2lkIFJlbmRlclBhcnRPYmplY3Q6 OnVwZGF0ZVdpZGdldChib29sIG9ubHlDcmVhdGVOb25OZXRzY2FwZVBsdWdpbnMpCiAgICAgICAg IC8vIENoZWNrIGZvciBhIGNoaWxkIEVNQkVEIHRhZy4KICAgICAgICAgSFRNTEVtYmVkRWxlbWVu dCogZW1iZWQgPSAwOwogICAgICAgICBjb25zdCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhID0gZnJh bWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpOwotICAgICAgICBpZiAoc2hvdWxkVXNlQ2hpbGRFbWJl ZE9mT2JqZWN0KG8sIHBsdWdpbkRhdGEpKSB7CisgICAgICAgIGlmIChwbHVnaW5EYXRhICYmIHNo b3VsZFVzZUNoaWxkRW1iZWRPZk9iamVjdChvLCBwbHVnaW5EYXRhKSkgewogICAgICAgICAgICAg Zm9yIChOb2RlKiBjaGlsZCA9IG8tPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7KSB7CiAgICAgICAgICAg ICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKGVtYmVkVGFnKSkgewogICAgICAgICAgICAgICAg ICAgICBlbWJlZCA9IHN0YXRpY19jYXN0PEhUTUxFbWJlZEVsZW1lbnQqPihjaGlsZCk7CmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBj OWRjNmEyLi4xMDU3MGMxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNCBAQAogMjAwOS0wMS0xNiAgQXJpeWEgSGlk YXlhdCAgPGFyaXlhLmhpZGF5YXRAdHJvbGx0ZWNoLmNvbT4KIAorICAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgIFtRdF0gUHJldmVudCBjcmFzaCBpZiBwbHVn aW4gZGF0YSBpcyBOVUxMLgorCisgICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50UXQuY3BwOiBOVUxMIGNoZWNrLgorICAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy Q2xpZW50UXQ6Om9iamVjdENvbnRlbnRUeXBlKToKKworMjAwOS0wMS0xNiAgQXJpeWEgSGlkYXlh dCAgPGFyaXlhLmhpZGF5YXRAdHJvbGx0ZWNoLmNvbT4KKwogICAgICAgICBSdWJiZXItc3RhbXBl ZCBieSBTaW1vbiBIYXVzbWFubi4KIAogICAgICAgICBbUXRdIFBlci1saW5lIGN1cnNvciBtb3Zl bWVudCB0ZXN0cyBkZXBlbmQgb24gcGxhdGZvcm0tc3BlY2lmaWMgZm9udApkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IDlkYjcxMzcu LjQwZjYzNTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHAKQEAgLTEwMDAsNyArMTAwMCw3IEBAIE9iamVjdENvbnRlbnRUeXBlIEZyYW1l TG9hZGVyQ2xpZW50UXQ6Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QK ICAgICBpZiAoUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJl Z2lzdGVyZWQobWltZVR5cGUpKQogICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudE5ldHNjYXBl UGx1Z2luOwogCi0gICAgaWYgKG1fZnJhbWUtPnBhZ2UoKSAmJiBtX2ZyYW1lLT5wYWdlKCktPnBs dWdpbkRhdGEoKS0+c3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZSkpCisgICAgaWYgKG1fZnJhbWUt PnBhZ2UoKSAmJiBtX2ZyYW1lLT5wYWdlKCktPnBsdWdpbkRhdGEoKSAmJiBtX2ZyYW1lLT5wYWdl KCktPnBsdWdpbkRhdGEoKS0+c3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZSkpCiAgICAgICAgIHJl dHVybiBPYmplY3RDb250ZW50T3RoZXJQbHVnaW47CiAKICAgICBpZiAoTUlNRVR5cGVSZWdpc3Ry eTo6aXNTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkK