58276 2011-04-11 15:22:31 -0700 Prevent duplicate plug-ins from loading on Windows due to WOW64 folder redirection 2011-04-18 09:16:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED DUPLICATE 49075 P2 Normal --- 49075 1 sfalken sfalken aroben jhoneycutt webkit-ews webkit.review.bot oldest_to_newest 383591 0 sfalken 2011-04-11 15:22:31 -0700 Prevent duplicate plug-ins from loading on Windows 383624 1 89110 sfalken 2011-04-11 15:55:09 -0700 Created attachment 89110 Patch 383627 2 89111 sfalken 2011-04-11 15:57:16 -0700 Created attachment 89111 Patch 383631 3 webkit.review.bot 2011-04-11 16:00:19 -0700 Attachment 89110 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 383633 4 webkit.review.bot 2011-04-11 16:00:59 -0700 Attachment 89111 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 383649 5 webkit-ews 2011-04-11 16:17:05 -0700 Attachment 89111 did not build on qt: Build output: http://queues.webkit.org/results/8390090 383941 6 aroben 2011-04-12 05:05:07 -0700 You are really good at filing duplicates of bugs I filed months ago. :-) *** This bug has been marked as a duplicate of bug 49075 *** 383943 7 aroben 2011-04-12 05:08:52 -0700 Hm, I guess your fix is a bit more specific than bug 49075 describes. I've updated the title to be more specific. I think this should probably be implemented in PluginInfoStore::shouldUsePlugin. That's where Mac makes sure that only one plugin with a given bundle identifier gets loaded, e.g. 383944 8 aroben 2011-04-12 05:11:23 -0700 Actually, I think maybe this is in fact a dupe of bug 49075 after all. The plan in that bug is to prevent two plugins with the same filename from being loaded. WebCore already has this behavior. That would fix this bug, too, I think (and be quite a bit simpler). *** This bug has been marked as a duplicate of bug 49075 *** 387779 9 89111 eric 2011-04-18 09:16:55 -0700 Comment on attachment 89111 Patch Cleared review? from attachment 89111 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 89110 2011-04-11 15:55:09 -0700 2011-04-11 15:57:13 -0700 Patch bug-58276-20110411155452.patch text/plain 7526 sfalken SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQtMTEgIFN0ZXZlIEZh bGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIEZJWE1FLgorCisgICAgICAgICogcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0 YWJhc2U6OmdldFBsdWdpblBhdGhzSW5EaXJlY3Rvcmllcyk6CisKIDIwMTEtMDQtMTEgIEFsZXhl eSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFj aWVqIFN0YWNob3dpYWsuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5E YXRhYmFzZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy93aW4v UGx1Z2luRGF0YWJhc2VXaW4uY3BwCShyZXZpc2lvbiA4MzQ1MikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0 LDYgKzExNCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRQbHVnaW5QYXRoc0Zyb21SZWcKIAog dm9pZCBQbHVnaW5EYXRhYmFzZTo6Z2V0UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzKEhhc2hTZXQ8 U3RyaW5nPiYgcGF0aHMpIGNvbnN0CiB7CisgICAgLy8gRklYTUU6IFByZXZlbnQgZHVwbGljYXRl IHBsdWctaW4gZW50cmllcyBmcm9tIGJvdGggU3lzV09XNjQgYW5kIFN5c3RlbTMyLgogICAgIC8v IEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIGNhc2UgaW5zZW5zaXRpdmUgc2V0LgogICAgIEhhc2hT ZXQ8U3RyaW5nPiB1bmlxdWVGaWxlbmFtZXM7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgz NTI0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjMgQEAKKzIwMTEtMDQtMTEgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2 ZW50IGR1cGxpY2F0ZSBwbHVnLWlucyBmcm9tIGxvYWRpbmcgb24gV2luZG93cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyNzYKKyAgICAgICAgCisg ICAgICAgIFRoaXMgYWRkcmVzc2VzIHRoZSBpc3N1ZSBmb3IgV2ViS2l0Miwgd2hpY2ggd2FzIGNh dXNpbmcgY3Jhc2hlcy4KKyAgICAgICAgV2ViS2l0MSBzdGlsbCBoYXMgdGhpcyBwcm9ibGVtLCBh bmQgSSd2ZSBhZGRlZCBhIEZJWE1FIHRvIHRoYXQgY29kZSwKKyAgICAgICAgYnV0IHRoZXJlIGlz IG5vIGtub3duIGVuZC11c2VyIHN5bXB0b20gaW4gdGhhdCBjb2RlLgorCisgICAgICAgICogVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luSW5mb1N0b3JlOjpsb2FkUGx1Z2luc0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBVSVByb2Nl c3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lu cy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZv U3RvcmU6OnJlbW92ZVBsdWdpblJlZGlyZWN0aW9uRHVwbGljYXRlcyk6CisgICAgICAgICogVUlQ cm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHA6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpbkluZm9TdG9yZTo6c2hvdWxkVXNlUGx1Z2luKToKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luSW5mb1N0b3JlOjpyZW1vdmVQbHVnaW5SZWRpcmVjdGlvbkR1cGxpY2F0ZXMpOgorCiAy MDExLTA0LTExICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCShyZXZpc2lvbiA4 MzQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9y ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDEyICs1OSw2IEBAIHN0YXRpYyB2b2lkIGFkZEZy b21WZWN0b3IoSGFzaFNldDxULCBVLAogICAgICAgICBoYXNoU2V0LmFkZCh2ZWN0b3JbaV0pOwog fQogCi0jaWYgT1MoV0lORE9XUykKLXR5cGVkZWYgSGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5n SGFzaD4gUGF0aEhhc2hTZXQ7Ci0jZWxzZQotdHlwZWRlZiBIYXNoU2V0PFN0cmluZz4gUGF0aEhh c2hTZXQ7Ci0jZW5kaWYKLQogdm9pZCBQbHVnaW5JbmZvU3RvcmU6OmxvYWRQbHVnaW5zSWZOZWNl c3NhcnkoKQogewogICAgIGlmIChtX3BsdWdpbkxpc3RJc1VwVG9EYXRlKQpAQCAtODYsNiArODAs OSBAQCB2b2lkIFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbnNJZk5lY2VzCiAgICAgLy8gVGhl biBsb2FkIHBsdWctaW5zIHRoYXQgYXJlIG5vdCBpbiB0aGUgc3RhbmRhcmQgcGx1Zy1pbnMgZGly ZWN0b3JpZXMuCiAgICAgYWRkRnJvbVZlY3Rvcih1bmlxdWVQbHVnaW5QYXRocywgaW5kaXZpZHVh bFBsdWdpblBhdGhzKCkpOwogCisgICAgLy8gVGhlbiByZW1vdmUgYW55IHJlZHVuZGFudCBwbHVn LWluIGVudHJpZXMgY2F1c2VkIGJ5IGZvbGRlciByZWRpcmVjdGlvbgorICAgIHJlbW92ZVBsdWdp blJlZGlyZWN0aW9uRHVwbGljYXRlcyh1bmlxdWVQbHVnaW5QYXRocyk7CisKICAgICBQYXRoSGFz aFNldDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gdW5pcXVlUGx1Z2luUGF0aHMuZW5kKCk7CiAgICAg Zm9yIChQYXRoSGFzaFNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSB1bmlxdWVQbHVnaW5QYXRocy5i ZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGxvYWRQbHVnaW4oKml0KTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9y ZS5oCShyZXZpc2lvbiA4MzQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbkluZm9TdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw4IEBACiAjZGVm aW5lIFBsdWdpbkluZm9TdG9yZV9oCiAKICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdpbkRhdGEuaD4K KyNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hhc2gu aD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEtVUkw7CkBAIC03Nyw2ICs3OSwx MiBAQCBwcml2YXRlOgogICAgIAogICAgIC8vIFBsYXRmb3JtLXNwZWNpZmljIG1lbWJlciBmdW5j dGlvbnMKIAorI2lmIE9TKFdJTkRPV1MpCisgICAgdHlwZWRlZiBIYXNoU2V0PFN0cmluZywgQ2Fz ZUZvbGRpbmdIYXNoPiBQYXRoSGFzaFNldDsKKyNlbHNlCisgICAgdHlwZWRlZiBIYXNoU2V0PFN0 cmluZz4gUGF0aEhhc2hTZXQ7CisjZW5kaWYKKwogICAgIC8vIFJldHVybnMgcGF0aHMgdG8gZGly ZWN0b3JpZXMgdGhhdCBzaG91bGQgYmUgc2VhcmNoZWQgZm9yIHBsdWctaW5zICh2aWEgcGx1Z2lu UGF0aHNJbkRpcmVjdG9yeSkuCiAgICAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IHBsdWdpbnNEaXJl Y3RvcmllcygpOwogICAgIC8vIFJldHVybnMgcGF0aHMgdG8gYWxsIHBsdWctaW5zIGluIHRoZSBz cGVjaWZpZWQgZGlyZWN0b3J5LgpAQCAtODYsNiArOTQsOCBAQCBwcml2YXRlOgogICAgIHN0YXRp YyBib29sIGdldFBsdWdpbkluZm8oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW4mIHBs dWdpbik7CiAgICAgYm9vbCBzaG91bGRVc2VQbHVnaW4oY29uc3QgUGx1Z2luJiBwbHVnaW4pOwog ICAgIHN0YXRpYyBTdHJpbmcgZ2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBl eHRlbnNpb24pOworICAgIC8vIFJlbW92ZXMgYW55IGR1cGxpY2F0ZXMgY2F1c2VkIGJ5IGZvbGRl ciByZWRpcmVjdGlvbgorICAgIHZvaWQgcmVtb3ZlUGx1Z2luUmVkaXJlY3Rpb25EdXBsaWNhdGVz KFBhdGhIYXNoU2V0Jik7CiAKICAgICBWZWN0b3I8U3RyaW5nPiBtX2FkZGl0aW9uYWxQbHVnaW5z RGlyZWN0b3JpZXM7CiAgICAgVmVjdG9yPFBsdWdpbj4gbV9wbHVnaW5zOwpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5m b1N0b3JlTWFjLm1tCShyZXZpc2lvbiA4MzQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTk5 LDQgKzk5LDggQEAgU3RyaW5nIFBsdWdpbkluZm9TdG9yZTo6Z2V0TUlNRVR5cGVGb3JFeAogICAg IHJldHVybiBXS0dldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKChOU1N0cmluZyAqKWV4dGVuc2lvbkNG U3RyaW5nLmdldCgpKTsKIH0KIAordm9pZCBQbHVnaW5JbmZvU3RvcmU6OnJlbW92ZVBsdWdpblJl ZGlyZWN0aW9uRHVwbGljYXRlcyhQYXRoSGFzaFNldCYpCit7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdp bkluZm9TdG9yZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHAJKHJldmlzaW9uIDgzNDUyKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIk5ldHNjYXBl UGx1Z2luTW9kdWxlLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9QYXRoV2Fsa2VyLmg+CisjaW5jbHVk ZSA8c2hsb2JqLmg+CiAjaW5jbHVkZSA8c2hsd2FwaS5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKQEAgLTM5Niw0ICszOTcsNDEgQEAgYm9vbCBQbHVnaW5JbmZvU3RvcmU6OnNob3VsZFVz ZVBsdWdpbihjbwogICAgIHJldHVybiB0cnVlOwogfQogCit2b2lkIFBsdWdpbkluZm9TdG9yZTo6 cmVtb3ZlUGx1Z2luUmVkaXJlY3Rpb25EdXBsaWNhdGVzKFBhdGhIYXNoU2V0JiB1bmlxdWVQbHVn aW5QYXRocykKK3sKKyNpZm5kZWYgX1dJTjY0CisgICAgLy8gUmVtb3ZlIGFueSAiZHVwbGljYXRl IiBpbnN0YW5jZXMgb2YgcGx1Zy1pbiBwYXRocyB3aGVyZSB0aGUgb25seSBkaWZmZXJlbmNlCisg ICAgLy8gYmV0d2VlbiB0aGUgdHdvIHBhdGhzIGlzIHRoZSB1c2Ugb2YgU3lzV09XNjQgaW5zdGVh ZCBvZiBTeXN0ZW0zMi4KKyAgICAvLyBUaGlzIHByZXZlbnRzIGR1cGxpY2F0ZSBwbHVnLWluIGVu dHJpZXMsIHNpbmNlIFN5c1dPVzY0IGFuZCBzeXN0ZW0zMiBib3RoCisgICAgLy8gcmVkaXJlY3Qg dG8gU3lzV09XNjQgb24gMzItYml0IFdpbmRvd3MuCisgICAgLy8gV2UgZG8gdGhpcyBieSByZW1v dmluZyBhbnkgcGF0aHMgY29udGFpbmluZyBTeXNXT1c2NCB3aGVyZSB0aGUgc2FtZSBwYXRoCisg ICAgLy8gaXMgcHJlc2VudCBpbiB0aGUgc2V0IHVzaW5nIHRoZSBTeXN0ZW0zMiB2YXJpYW50IG9m IHRoZSBwYXRoLgorICAgIC8vIFdlIG9ubHkgZG8gdGhpcyBmb3IgMzItYml0IFdlYktpdCBjb2Rl LCBzaW5jZSBvbiBhIDY0LWJpdCBzeXN0ZW0sCisgICAgLy8gU3lzdGVtMzIgZG9lc24ndCByZWRp cmVjdCB0byBTeXNXT1c2NC4KKworICAgIFdDSEFSIHN5c3RlbVBhdGhCdWZmZXJbTUFYX1BBVEhd OworICAgIGlmIChGQUlMRUQoOjpTSEdldEZvbGRlclBhdGhXKDAsIENTSURMX1NZU1RFTSwgMCwg MCwgc3lzdGVtUGF0aEJ1ZmZlcikpKQorICAgICAgICByZXR1cm47CisgICAgU3RyaW5nIHN5c3Rl bVBhdGgoc3lzdGVtUGF0aEJ1ZmZlcik7CisgICAgV0NIQVIgc3lzdGVtUGF0aFg4NkJ1ZmZlcltN QVhfUEFUSF07CisgICAgaWYgKEZBSUxFRCg6OlNIR2V0Rm9sZGVyUGF0aFcoMCwgQ1NJRExfU1lT VEVNWDg2LCAwLCAwLCBzeXN0ZW1QYXRoWDg2QnVmZmVyKSkpCisgICAgICAgIHJldHVybjsKKyAg ICBTdHJpbmcgc3lzdGVtUGF0aFg4NihzeXN0ZW1QYXRoWDg2QnVmZmVyKTsKKyAgICBBU1NFUlQo c3lzdGVtUGF0aCAhPSBzeXN0ZW1QYXRoWDg2KTsKKworICAgIFZlY3RvcjxTdHJpbmc+IGR1cGxp Y2F0ZVBsdWdpblBhdGhzOworICAgIFBhdGhIYXNoU2V0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSB1 bmlxdWVQbHVnaW5QYXRocy5lbmQoKTsKKyAgICBmb3IgKFBhdGhIYXNoU2V0Ojpjb25zdF9pdGVy YXRvciBpdCA9IHVuaXF1ZVBsdWdpblBhdGhzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewor ICAgICAgICBpZiAoaXQtPnN0YXJ0c1dpdGgoc3lzdGVtUGF0aFg4NiwgZmFsc2UpKSB7CisgICAg ICAgICAgICBTdHJpbmcgcmVkaXJlY3RlZFBhdGggPSAqaXQ7CisgICAgICAgICAgICByZWRpcmVj dGVkUGF0aC5yZXBsYWNlKDAsIHN5c3RlbVBhdGhYODYubGVuZ3RoKCksIHN5c3RlbVBhdGgpOwor ICAgICAgICAgICAgaWYgKHVuaXF1ZVBsdWdpblBhdGhzLmNvbnRhaW5zKHJlZGlyZWN0ZWRQYXRo KSkKKyAgICAgICAgICAgICAgICBkdXBsaWNhdGVQbHVnaW5QYXRocy5hcHBlbmQoKml0KTsKKyAg ICAgICAgfQorICAgIH0KKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGR1cGxpY2F0ZVBsdWdp blBhdGhzLnNpemUoKTsgKytpKQorICAgICAgICB1bmlxdWVQbHVnaW5QYXRocy5yZW1vdmUoZHVw bGljYXRlUGx1Z2luUGF0aHNbaV0pOworI2VuZGlmCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAo= 89111 2011-04-11 15:57:16 -0700 2011-04-18 09:16:55 -0700 Patch bug-58276-20110411155659.patch text/plain 7560 sfalken SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQtMTEgIFN0ZXZlIEZh bGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIEZJWE1FLgorCisgICAgICAgICogcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0 YWJhc2U6OmdldFBsdWdpblBhdGhzSW5EaXJlY3Rvcmllcyk6CisKIDIwMTEtMDQtMTEgIEFsZXhl eSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFj aWVqIFN0YWNob3dpYWsuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5E YXRhYmFzZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy93aW4v UGx1Z2luRGF0YWJhc2VXaW4uY3BwCShyZXZpc2lvbiA4MzQ1MikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0 LDYgKzExNCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRQbHVnaW5QYXRoc0Zyb21SZWcKIAog dm9pZCBQbHVnaW5EYXRhYmFzZTo6Z2V0UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzKEhhc2hTZXQ8 U3RyaW5nPiYgcGF0aHMpIGNvbnN0CiB7CisgICAgLy8gRklYTUU6IFByZXZlbnQgZHVwbGljYXRl IHBsdWctaW4gZW50cmllcyBmcm9tIGJvdGggU3lzV09XNjQgYW5kIFN5c3RlbTMyLgogICAgIC8v IEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIGNhc2UgaW5zZW5zaXRpdmUgc2V0LgogICAgIEhhc2hT ZXQ8U3RyaW5nPiB1bmlxdWVGaWxlbmFtZXM7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgz NTI0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjQgQEAKKzIwMTEtMDQtMTEgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2 ZW50IGR1cGxpY2F0ZSBwbHVnLWlucyBmcm9tIGxvYWRpbmcgb24gV2luZG93cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyNzYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzkwNjUzNzQ+CisgICAgICAgIAorICAgICAgICBUaGlzIGFkZHJlc3NlcyB0 aGUgaXNzdWUgZm9yIFdlYktpdDIsIHdoaWNoIHdhcyBjYXVzaW5nIGNyYXNoZXMuCisgICAgICAg IFdlYktpdDEgc3RpbGwgaGFzIHRoaXMgcHJvYmxlbSwgYW5kIEkndmUgYWRkZWQgYSBGSVhNRSB0 byB0aGF0IGNvZGUsCisgICAgICAgIGJ1dCB0aGVyZSBpcyBubyBrbm93biBlbmQtdXNlciBzeW1w dG9tIGluIHRoYXQgY29kZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbklu Zm9TdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdp bnNJZk5lY2Vzc2FyeSk6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0 b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpyZW1vdmVQbHVnaW5SZWRp cmVjdGlvbkR1cGxpY2F0ZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVn aW5JbmZvU3RvcmVXaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OnNo b3VsZFVzZVBsdWdpbik6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6cmVtb3Zl UGx1Z2luUmVkaXJlY3Rpb25EdXBsaWNhdGVzKToKKwogMjAxMS0wNC0xMSAgQWxleGV5IFByb3Nr dXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3Rh Y2hvd2lhay4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbklu Zm9TdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdp bnMvUGx1Z2luSW5mb1N0b3JlLmNwcAkocmV2aXNpb24gODM0NTIpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01OSwxMiArNTksNiBAQCBzdGF0aWMgdm9pZCBhZGRGcm9tVmVjdG9yKEhhc2hTZXQ8VCwgVSwK ICAgICAgICAgaGFzaFNldC5hZGQodmVjdG9yW2ldKTsKIH0KIAotI2lmIE9TKFdJTkRPV1MpCi10 eXBlZGVmIEhhc2hTZXQ8U3RyaW5nLCBDYXNlRm9sZGluZ0hhc2g+IFBhdGhIYXNoU2V0OwotI2Vs c2UKLXR5cGVkZWYgSGFzaFNldDxTdHJpbmc+IFBhdGhIYXNoU2V0OwotI2VuZGlmCi0KIHZvaWQg UGx1Z2luSW5mb1N0b3JlOjpsb2FkUGx1Z2luc0lmTmVjZXNzYXJ5KCkKIHsKICAgICBpZiAobV9w bHVnaW5MaXN0SXNVcFRvRGF0ZSkKQEAgLTg2LDYgKzgwLDkgQEAgdm9pZCBQbHVnaW5JbmZvU3Rv cmU6OmxvYWRQbHVnaW5zSWZOZWNlcwogICAgIC8vIFRoZW4gbG9hZCBwbHVnLWlucyB0aGF0IGFy ZSBub3QgaW4gdGhlIHN0YW5kYXJkIHBsdWctaW5zIGRpcmVjdG9yaWVzLgogICAgIGFkZEZyb21W ZWN0b3IodW5pcXVlUGx1Z2luUGF0aHMsIGluZGl2aWR1YWxQbHVnaW5QYXRocygpKTsKIAorICAg IC8vIFRoZW4gcmVtb3ZlIGFueSByZWR1bmRhbnQgcGx1Zy1pbiBlbnRyaWVzIGNhdXNlZCBieSBm b2xkZXIgcmVkaXJlY3Rpb24KKyAgICByZW1vdmVQbHVnaW5SZWRpcmVjdGlvbkR1cGxpY2F0ZXMo dW5pcXVlUGx1Z2luUGF0aHMpOworCiAgICAgUGF0aEhhc2hTZXQ6OmNvbnN0X2l0ZXJhdG9yIGVu ZCA9IHVuaXF1ZVBsdWdpblBhdGhzLmVuZCgpOwogICAgIGZvciAoUGF0aEhhc2hTZXQ6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gdW5pcXVlUGx1Z2luUGF0aHMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0 KQogICAgICAgICBsb2FkUGx1Z2luKCppdCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAkocmV2aXNpb24gODM0NTIpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAkod29y a2luZyBjb3B5KQpAQCAtMjcsNiArMjcsOCBAQAogI2RlZmluZSBQbHVnaW5JbmZvU3RvcmVfaAog CiAjaW5jbHVkZSA8V2ViQ29yZS9QbHVnaW5EYXRhLmg+CisjaW5jbHVkZSA8d3RmL0hhc2hTZXQu aD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICBjbGFzcyBLVVJMOwpAQCAtNzcsNiArNzksMTIgQEAgcHJpdmF0ZToKICAgICAKICAg ICAvLyBQbGF0Zm9ybS1zcGVjaWZpYyBtZW1iZXIgZnVuY3Rpb25zCiAKKyNpZiBPUyhXSU5ET1dT KQorICAgIHR5cGVkZWYgSGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gUGF0aEhhc2hT ZXQ7CisjZWxzZQorICAgIHR5cGVkZWYgSGFzaFNldDxTdHJpbmc+IFBhdGhIYXNoU2V0OworI2Vu ZGlmCisKICAgICAvLyBSZXR1cm5zIHBhdGhzIHRvIGRpcmVjdG9yaWVzIHRoYXQgc2hvdWxkIGJl IHNlYXJjaGVkIGZvciBwbHVnLWlucyAodmlhIHBsdWdpblBhdGhzSW5EaXJlY3RvcnkpLgogICAg IHN0YXRpYyBWZWN0b3I8U3RyaW5nPiBwbHVnaW5zRGlyZWN0b3JpZXMoKTsKICAgICAvLyBSZXR1 cm5zIHBhdGhzIHRvIGFsbCBwbHVnLWlucyBpbiB0aGUgc3BlY2lmaWVkIGRpcmVjdG9yeS4KQEAg LTg2LDYgKzk0LDggQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvKGNv bnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGx1Z2luJiBwbHVnaW4pOwogICAgIGJvb2wgc2hvdWxk VXNlUGx1Z2luKGNvbnN0IFBsdWdpbiYgcGx1Z2luKTsKICAgICBzdGF0aWMgU3RyaW5nIGdldE1J TUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKTsKKyAgICAvLyBSZW1v dmVzIGFueSBkdXBsaWNhdGVzIGNhdXNlZCBieSBmb2xkZXIgcmVkaXJlY3Rpb24KKyAgICB2b2lk IHJlbW92ZVBsdWdpblJlZGlyZWN0aW9uRHVwbGljYXRlcyhQYXRoSGFzaFNldCYpOwogCiAgICAg VmVjdG9yPFN0cmluZz4gbV9hZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yaWVzOwogICAgIFZlY3Rv cjxQbHVnaW4+IG1fcGx1Z2luczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVn aW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQkocmV2aXNpb24g ODM0NTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5m b1N0b3JlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05OSw0ICs5OSw4IEBAIFN0cmluZyBQbHVn aW5JbmZvU3RvcmU6OmdldE1JTUVUeXBlRm9yRXgKICAgICByZXR1cm4gV0tHZXRNSU1FVHlwZUZv ckV4dGVuc2lvbigoTlNTdHJpbmcgKilleHRlbnNpb25DRlN0cmluZy5nZXQoKSk7CiB9CiAKK3Zv aWQgUGx1Z2luSW5mb1N0b3JlOjpyZW1vdmVQbHVnaW5SZWRpcmVjdGlvbkR1cGxpY2F0ZXMoUGF0 aEhhc2hTZXQmKQoreworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZv U3RvcmVXaW4uY3BwCShyZXZpc2lvbiA4MzQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y OCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJOZXRzY2FwZVBsdWdpbk1vZHVsZS5oIgogI2luY2x1 ZGUgPFdlYkNvcmUvUGF0aFdhbGtlci5oPgorI2luY2x1ZGUgPHNobG9iai5oPgogI2luY2x1ZGUg PHNobHdhcGkuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0zOTYsNCArMzk3LDQx IEBAIGJvb2wgUGx1Z2luSW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4oY28KICAgICByZXR1cm4g dHJ1ZTsKIH0KIAordm9pZCBQbHVnaW5JbmZvU3RvcmU6OnJlbW92ZVBsdWdpblJlZGlyZWN0aW9u RHVwbGljYXRlcyhQYXRoSGFzaFNldCYgdW5pcXVlUGx1Z2luUGF0aHMpCit7CisjaWZuZGVmIF9X SU42NAorICAgIC8vIFJlbW92ZSBhbnkgImR1cGxpY2F0ZSIgaW5zdGFuY2VzIG9mIHBsdWctaW4g cGF0aHMgd2hlcmUgdGhlIG9ubHkgZGlmZmVyZW5jZQorICAgIC8vIGJldHdlZW4gdGhlIHR3byBw YXRocyBpcyB0aGUgdXNlIG9mIFN5c1dPVzY0IGluc3RlYWQgb2YgU3lzdGVtMzIuCisgICAgLy8g VGhpcyBwcmV2ZW50cyBkdXBsaWNhdGUgcGx1Zy1pbiBlbnRyaWVzLCBzaW5jZSBTeXNXT1c2NCBh bmQgc3lzdGVtMzIgYm90aAorICAgIC8vIHJlZGlyZWN0IHRvIFN5c1dPVzY0IG9uIDMyLWJpdCBX aW5kb3dzLgorICAgIC8vIFdlIGRvIHRoaXMgYnkgcmVtb3ZpbmcgYW55IHBhdGhzIGNvbnRhaW5p bmcgU3lzV09XNjQgd2hlcmUgdGhlIHNhbWUgcGF0aAorICAgIC8vIGlzIHByZXNlbnQgaW4gdGhl IHNldCB1c2luZyB0aGUgU3lzdGVtMzIgdmFyaWFudCBvZiB0aGUgcGF0aC4KKyAgICAvLyBXZSBv bmx5IGRvIHRoaXMgZm9yIDMyLWJpdCBXZWJLaXQgY29kZSwgc2luY2Ugb24gYSA2NC1iaXQgc3lz dGVtLAorICAgIC8vIFN5c3RlbTMyIGRvZXNuJ3QgcmVkaXJlY3QgdG8gU3lzV09XNjQuCisKKyAg ICBXQ0hBUiBzeXN0ZW1QYXRoQnVmZmVyW01BWF9QQVRIXTsKKyAgICBpZiAoRkFJTEVEKDo6U0hH ZXRGb2xkZXJQYXRoVygwLCBDU0lETF9TWVNURU0sIDAsIDAsIHN5c3RlbVBhdGhCdWZmZXIpKSkK KyAgICAgICAgcmV0dXJuOworICAgIFN0cmluZyBzeXN0ZW1QYXRoKHN5c3RlbVBhdGhCdWZmZXIp OworICAgIFdDSEFSIHN5c3RlbVBhdGhYODZCdWZmZXJbTUFYX1BBVEhdOworICAgIGlmIChGQUlM RUQoOjpTSEdldEZvbGRlclBhdGhXKDAsIENTSURMX1NZU1RFTVg4NiwgMCwgMCwgc3lzdGVtUGF0 aFg4NkJ1ZmZlcikpKQorICAgICAgICByZXR1cm47CisgICAgU3RyaW5nIHN5c3RlbVBhdGhYODYo c3lzdGVtUGF0aFg4NkJ1ZmZlcik7CisgICAgQVNTRVJUKHN5c3RlbVBhdGggIT0gc3lzdGVtUGF0 aFg4Nik7CisKKyAgICBWZWN0b3I8U3RyaW5nPiBkdXBsaWNhdGVQbHVnaW5QYXRoczsKKyAgICBQ YXRoSGFzaFNldDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gdW5pcXVlUGx1Z2luUGF0aHMuZW5kKCk7 CisgICAgZm9yIChQYXRoSGFzaFNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSB1bmlxdWVQbHVnaW5Q YXRocy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgaWYgKGl0LT5zdGFydHNX aXRoKHN5c3RlbVBhdGhYODYsIGZhbHNlKSkgeworICAgICAgICAgICAgU3RyaW5nIHJlZGlyZWN0 ZWRQYXRoID0gKml0OworICAgICAgICAgICAgcmVkaXJlY3RlZFBhdGgucmVwbGFjZSgwLCBzeXN0 ZW1QYXRoWDg2Lmxlbmd0aCgpLCBzeXN0ZW1QYXRoKTsKKyAgICAgICAgICAgIGlmICh1bmlxdWVQ bHVnaW5QYXRocy5jb250YWlucyhyZWRpcmVjdGVkUGF0aCkpCisgICAgICAgICAgICAgICAgZHVw bGljYXRlUGx1Z2luUGF0aHMuYXBwZW5kKCppdCk7CisgICAgICAgIH0KKyAgICB9CisgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBkdXBsaWNhdGVQbHVnaW5QYXRocy5zaXplKCk7ICsraSkKKyAg ICAgICAgdW5pcXVlUGx1Z2luUGF0aHMucmVtb3ZlKGR1cGxpY2F0ZVBsdWdpblBhdGhzW2ldKTsK KyNlbmRpZgorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK