41006 2010-06-22 12:44:10 -0700 Wean NetscapePluginHostManager of any knowledge about WebNetscapePluginPackage 2010-06-22 12:54:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 241398 0 andersca 2010-06-22 12:44:10 -0700 Wean NetscapePluginHostManager of any knowledge about WebNetscapePluginPackage 241399 1 59406 andersca 2010-06-22 12:46:12 -0700 Created attachment 59406 Patch 241404 2 andersca 2010-06-22 12:54:55 -0700 Committed r61625: <http://trac.webkit.org/changeset/61625> 59406 2010-06-22 12:46:12 -0700 2010-06-22 12:47:38 -0700 Patch bug-41006-20100622124611.patch text/plain 12961 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTYyNCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZWFuIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIgb2YgYW55IGtub3dsZWRn ZSBhYm91dCBXZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDA2CisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3Rl ZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLmg6CisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQv TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQ bHVnaW5Ib3N0TWFuYWdlcjo6aG9zdEZvclBsdWdpbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNj YXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNwYXduUGx1Z2luSG9zdCk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGx1Z2luKToKKyAgICAgICAg KFdlYktpdDo6TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6Y3JlYXRlUHJvcGVydHlMaXN0Rmls ZSk6CisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcgY3JlYXRlUGx1Z2lu XSk6CisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW06CisgICAg ICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSBjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlXSk6 CisKIDIwMTAtMDYtMjEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0L21hYy9QbHVnaW5z L1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1Bs dWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCShyZXZpc2lvbiA2MTYxOCkKKysrIFdl YktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0JKHdvcmtpbmcgY29w eSkKQEAgLTMwMiw3ICszMDIsNyBAQCAtIChjcHVfdHlwZV90KXBsdWdpbkhvc3RBcmNoaXRlY3R1 cmUKIAogLSAodm9pZCljcmVhdGVQcm9wZXJ0eUxpc3RGaWxlCiB7Ci0gICAgTmV0c2NhcGVQbHVn aW5Ib3N0TWFuYWdlcjo6Y3JlYXRlUHJvcGVydHlMaXN0RmlsZShzZWxmKTsKKyAgICBOZXRzY2Fw ZVBsdWdpbkhvc3RNYW5hZ2VyOjpjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlKHBhdGgsIHBsdWdpbkhv c3RBcmNoaXRlY3R1cmUpOwogfQogCiAjZW5kaWYKSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9I b3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9t YWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5oCShyZXZpc2lvbiA2 MTYxOCkKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFu YWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMSArMjgsMTIgQEAKICNpZm5kZWYgTmV0c2Nh cGVQbHVnaW5Ib3N0TWFuYWdlcl9oCiAjZGVmaW5lIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXJf aAogCisjaW1wb3J0IDxXZWJDb3JlL1BsYXRmb3JtU3RyaW5nLmg+CisjaW1wb3J0IDxXZWJDb3Jl L1N0cmluZ0hhc2guaD4KICNpbXBvcnQgPHd0Zi9IYXNoTWFwLmg+CiAjaW1wb3J0IDx3dGYvUGFz c1JlZlB0ci5oPgogCiBAY2xhc3MgV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3OwotQGNsYXNz IFdlYk5ldHNjYXBlUGx1Z2luUGFja2FnZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTQz LDI4ICs0NCwyOCBAQCBjbGFzcyBOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyIHsKIHB1YmxpYzoK ICAgICBzdGF0aWMgTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlciYgc2hhcmVkKCk7CiAgICAgCi0g ICAgUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk+IGluc3RhbnRpYXRlUGx1 Z2luKFdlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSAqLCBXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZp ZXcgKiwgTlNTdHJpbmcgKm1pbWVUeXBlLCBOU0FycmF5ICphdHRyaWJ1dGVLZXlzLCBOU0FycmF5 ICphdHRyaWJ1dGVWYWx1ZXMsIE5TU3RyaW5nICp1c2VyQWdlbnQsIE5TVVJMICpzb3VyY2VVUkws IGJvb2wgZnVsbEZyYW1lLCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKTsKKyAgICBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1 Z2luSW5zdGFuY2VQcm94eT4gaW5zdGFudGlhdGVQbHVnaW4oY29uc3QgV2ViQ29yZTo6U3RyaW5n JiBwbHVnaW5QYXRoLCBjcHVfdHlwZV90IHBsdWdpbkFyY2hpdGVjdHVyZSwgY29uc3QgV2ViQ29y ZTo6U3RyaW5nJiBidW5kbGVJZGVudGlmaWVyLCBXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcg KiwgTlNTdHJpbmcgKm1pbWVUeXBlLCBOU0FycmF5ICphdHRyaWJ1dGVLZXlzLCBOU0FycmF5ICph dHRyaWJ1dGVWYWx1ZXMsIE5TU3RyaW5nICp1c2VyQWdlbnQsIE5TVVJMICpzb3VyY2VVUkwsIGJv b2wgZnVsbEZyYW1lLCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKTsKIAogICAgIHZvaWQgcGx1Z2luSG9zdERpZWQoTmV0 c2NhcGVQbHVnaW5Ib3N0UHJveHkqKTsKIAotICAgIHN0YXRpYyB2b2lkIGNyZWF0ZVByb3BlcnR5 TGlzdEZpbGUoV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlICopOworICAgIHN0YXRpYyB2b2lkIGNy ZWF0ZVByb3BlcnR5TGlzdEZpbGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBwbHVnaW5QYXRoLCBj cHVfdHlwZV90IHBsdWdpbkFyY2hpdGVjdHVyZSk7CiAgICAgCiAgICAgdm9pZCBkaWRDcmVhdGVX aW5kb3coKTsKICAgICAKIHByaXZhdGU6Ci0gICAgTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqIGhv c3RGb3JQYWNrYWdlKFdlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSAqLCBib29sIHVzZVByb3hpZWRP cGVuUGFuZWwpOworICAgIE5ldHNjYXBlUGx1Z2luSG9zdFByb3h5KiBob3N0Rm9yUGx1Z2luKGNv bnN0IFdlYkNvcmU6OlN0cmluZyYgcGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRl Y3R1cmUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgYm9vbCB1c2VQ cm94aWVkT3BlblBhbmVsKTsKIAogICAgIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIoKTsKICAg ICB+TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcigpOwogICAgIAotICAgIGJvb2wgc3Bhd25QbHVn aW5Ib3N0KFdlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSAqLCBtYWNoX3BvcnRfdCBjbGllbnRQb3J0 LCBtYWNoX3BvcnRfdCYgcGx1Z2luSG9zdFBvcnQsIFByb2Nlc3NTZXJpYWxOdW1iZXImIHBsdWdp bkhvc3RQU04sIGJvb2wgdXNlUHJveGllZE9wZW5QYW5lbCk7CisgICAgYm9vbCBzcGF3blBsdWdp bkhvc3QoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBwbHVnaW5QYXRoLCBjcHVfdHlwZV90IHBsdWdp bkFyY2hpdGVjdHVyZSwgbWFjaF9wb3J0X3QgY2xpZW50UG9ydCwgbWFjaF9wb3J0X3QmIHBsdWdp bkhvc3RQb3J0LCBQcm9jZXNzU2VyaWFsTnVtYmVyJiBwbHVnaW5Ib3N0UFNOLCBib29sIHVzZVBy b3hpZWRPcGVuUGFuZWwpOwogICAgIAogICAgIGJvb2wgaW5pdGlhbGl6ZVZlbmRvclBvcnQoKTsK ICAgICAKICAgICBtYWNoX3BvcnRfdCBtX3BsdWdpblZlbmRvclBvcnQ7CiAgICAgCiAgICAgLy8g RklYTUU6IFRoaXMgc2hvdWxkIHJlYWxseSBiZSBhIEhhc2hNYXAgb2YgUmV0YWluUHRycywgYnV0 IHRoYXQgZG9lc24ndCB3b3JrIHJpZ2h0IG5vdy4KLSAgICB0eXBlZGVmIEhhc2hNYXA8V2ViTmV0 c2NhcGVQbHVnaW5QYWNrYWdlKiwgTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqPiBQbHVnaW5Ib3N0 TWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJDb3JlOjpTdHJpbmcsIE5ldHNjYXBlUGx1Z2lu SG9zdFByb3h5Kj4gUGx1Z2luSG9zdE1hcDsKICAgICBQbHVnaW5Ib3N0TWFwIG1fcGx1Z2luSG9z dHM7CiB9OwogICAgIApJbmRleDogV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBs dWdpbkhvc3RNYW5hZ2VyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0 ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbQkocmV2aXNpb24gNjE2MTgpCisrKyBXZWJL aXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgZXh0ZXJuICJDIiB7CiB9CiAKIHVzaW5nIG5hbWVz cGFjZSBzdGQ7Cit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKQEAgLTY5LDkgKzcwLDkgQEAgTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6fk5ldHNjYXBl UGx1ZwogewogfQogCi1OZXRzY2FwZVBsdWdpbkhvc3RQcm94eSogTmV0c2NhcGVQbHVnaW5Ib3N0 TWFuYWdlcjo6aG9zdEZvclBhY2thZ2UoV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlICpwYWNrYWdl LCBib29sIHVzZVByb3hpZWRPcGVuUGFuZWwpCitOZXRzY2FwZVBsdWdpbkhvc3RQcm94eSogTmV0 c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6aG9zdEZvclBsdWdpbihjb25zdCBXZWJDb3JlOjpTdHJp bmcmIHBsdWdpblBhdGgsIGNwdV90eXBlX3QgcGx1Z2luQXJjaGl0ZWN0dXJlLCBjb25zdCBTdHJp bmcmIGJ1bmRsZUlkZW50aWZpZXIsIGJvb2wgdXNlUHJveGllZE9wZW5QYW5lbCkKIHsKLSAgICBw YWlyPFBsdWdpbkhvc3RNYXA6Oml0ZXJhdG9yLCBib29sPiByZXN1bHQgPSBtX3BsdWdpbkhvc3Rz LmFkZChwYWNrYWdlLCAwKTsKKyAgICBwYWlyPFBsdWdpbkhvc3RNYXA6Oml0ZXJhdG9yLCBib29s PiByZXN1bHQgPSBtX3BsdWdpbkhvc3RzLmFkZChwbHVnaW5QYXRoLCAwKTsKICAgICAKICAgICAv LyBUaGUgcGFja2FnZSB3YXMgYWxyZWFkeSBpbiB0aGUgbWFwLCBqdXN0IHJldHVybiBpdC4KICAg ICBpZiAoIXJlc3VsdC5zZWNvbmQpCkBAIC04NSw3ICs4Niw3IEBAIE5ldHNjYXBlUGx1Z2luSG9z dFByb3h5KiBOZXRzY2FwZVBsdWdpbkgKICAgICAKICAgICBtYWNoX3BvcnRfdCBwbHVnaW5Ib3N0 UG9ydDsKICAgICBQcm9jZXNzU2VyaWFsTnVtYmVyIHBsdWdpbkhvc3RQU047Ci0gICAgaWYgKCFz cGF3blBsdWdpbkhvc3QocGFja2FnZSwgY2xpZW50UG9ydCwgcGx1Z2luSG9zdFBvcnQsIHBsdWdp bkhvc3RQU04sIHVzZVByb3hpZWRPcGVuUGFuZWwpKSB7CisgICAgaWYgKCFzcGF3blBsdWdpbkhv c3QocGx1Z2luUGF0aCwgcGx1Z2luQXJjaGl0ZWN0dXJlLCBjbGllbnRQb3J0LCBwbHVnaW5Ib3N0 UG9ydCwgcGx1Z2luSG9zdFBTTiwgdXNlUHJveGllZE9wZW5QYW5lbCkpIHsKICAgICAgICAgbWFj aF9wb3J0X2Rlc3Ryb3kobWFjaF90YXNrX3NlbGYoKSwgY2xpZW50UG9ydCk7CiAgICAgICAgIG1f cGx1Z2luSG9zdHMucmVtb3ZlKHJlc3VsdC5maXJzdCk7CiAgICAgICAgIHJldHVybiAwOwpAQCAt OTMsMTcgKzk0LDE2IEBAIE5ldHNjYXBlUGx1Z2luSG9zdFByb3h5KiBOZXRzY2FwZVBsdWdpbkgK ICAgICAKICAgICAvLyBTaW5jZSBGbGFzaCBOUE9iamVjdHMgYWRkIG1ldGhvZHMgZHluYW1pY2Fs bHksIHdlIGRvbid0IHdhbnQgdG8gY2FjaGUgd2hlbiBhIHByb3BlcnR5L21ldGhvZCBkb2Vzbid0 IGV4aXN0CiAgICAgLy8gb24gYW4gb2JqZWN0IGJlY2F1c2UgaXQgY291bGQgYmUgYWRkZWQgbGF0 ZXIuCi0gICAgYm9vbCBzaG91bGRDYWNoZU1pc3NpbmdQcm9wZXJ0aWVzQW5kTWV0aG9kcyA9IFtw YWNrYWdlIGJ1bmRsZUlkZW50aWZpZXJdICE9ICJjb20ubWFjcm9tZWRpYS5GbGFzaCBQbGF5ZXIu cGx1Z2luIjsKKyAgICBib29sIHNob3VsZENhY2hlTWlzc2luZ1Byb3BlcnRpZXNBbmRNZXRob2Rz ID0gYnVuZGxlSWRlbnRpZmllciAhPSAiY29tLm1hY3JvbWVkaWEuRmxhc2ggUGxheWVyLnBsdWdp biI7CiAgICAgCiAgICAgTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqIGhvc3RQcm94eSA9IG5ldyBO ZXRzY2FwZVBsdWdpbkhvc3RQcm94eShjbGllbnRQb3J0LCBwbHVnaW5Ib3N0UG9ydCwgcGx1Z2lu SG9zdFBTTiwgc2hvdWxkQ2FjaGVNaXNzaW5nUHJvcGVydGllc0FuZE1ldGhvZHMpOwogICAgIAot ICAgIENGUmV0YWluKHBhY2thZ2UpOwogICAgIHJlc3VsdC5maXJzdC0+c2Vjb25kID0gaG9zdFBy b3h5OwogICAgIAogICAgIHJldHVybiBob3N0UHJveHk7CiB9CiAKLWJvb2wgTmV0c2NhcGVQbHVn aW5Ib3N0TWFuYWdlcjo6c3Bhd25QbHVnaW5Ib3N0KFdlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSAq cGFja2FnZSwgbWFjaF9wb3J0X3QgY2xpZW50UG9ydCwgbWFjaF9wb3J0X3QmIHBsdWdpbkhvc3RQ b3J0LCBQcm9jZXNzU2VyaWFsTnVtYmVyJiBwbHVnaW5Ib3N0UFNOLCBib29sIHVzZVByb3hpZWRP cGVuUGFuZWwpCitib29sIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNwYXduUGx1Z2luSG9z dChjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIGNwdV90eXBlX3QgcGx1Z2luQXJjaGl0ZWN0dXJl LCBtYWNoX3BvcnRfdCBjbGllbnRQb3J0LCBtYWNoX3BvcnRfdCYgcGx1Z2luSG9zdFBvcnQsIFBy b2Nlc3NTZXJpYWxOdW1iZXImIHBsdWdpbkhvc3RQU04sIGJvb2wgdXNlUHJveGllZE9wZW5QYW5l bCkKIHsKICAgICBpZiAobV9wbHVnaW5WZW5kb3JQb3J0ID09IE1BQ0hfUE9SVF9OVUxMKSB7CiAg ICAgICAgIGlmICghaW5pdGlhbGl6ZVZlbmRvclBvcnQoKSkKQEAgLTEyMSw3ICsxMjEsNyBAQCBi b29sIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNwYXduUGx1CiAgICAgCiAgICAgTlNEaWN0 aW9uYXJ5ICpsYXVuY2hQcm9wZXJ0aWVzID0gW1tOU0RpY3Rpb25hcnkgYWxsb2NdIGluaXRXaXRo T2JqZWN0c0FuZEtleXM6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBs dWdpbkhvc3RBcHBFeGVjdXRhYmxlUGF0aCwgQCJwbHVnaW5Ib3N0UGF0aCIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoSW50OltwYWNr YWdlIHBsdWdpbkhvc3RBcmNoaXRlY3R1cmVdXSwgQCJjcHVUeXBlIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhJbnQ6cGx1Z2luQXJj aGl0ZWN0dXJlXSwgQCJjcHVUeXBlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbG9jYWxpemF0aW9uLmdldCgpLCBAImxvY2FsaXphdGlvbiIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDp1c2VQcm94 aWVkT3BlblBhbmVsXSwgQCJ1c2VQcm94aWVkT3BlblBhbmVsIiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbmlsXTsKQEAgLTE1MiwxMSArMTUyLDExIEBAIGJvb2wgTmV0 c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6c3Bhd25QbHUKICAgICBOU1N0cmluZyAqdmlzaWJsZU5h bWUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpVSV9TVFJJTkcoIiVAICglQCBJbnRlcm5l dCBwbHVnLWluKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJ2aXNpYmxlIG5hbWUgb2YgdGhlIHBsdWctaW4gaG9zdCBw cm9jZXNzLiBUaGUgZmlyc3QgYXJndW1lbnQgaXMgdGhlIHBsdWctaW4gbmFtZSAiCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJhbmQgdGhlIHNlY29uZCBhcmd1bWVudCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZS4iKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgWyhOU1N0cmluZyAqKVtwYWNrYWdlIHBsdWdpbklu Zm9dLmZpbGUgc3RyaW5nQnlEZWxldGluZ1BhdGhFeHRlbnNpb25dLCBbW05TUHJvY2Vzc0luZm8g cHJvY2Vzc0luZm9dIHByb2Nlc3NOYW1lXV07CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFtbKE5TU3RyaW5nKilwbHVnaW5QYXRoIGxhc3RQYXRoQ29tcG9uZW50XSBzdHJpbmdCeURlbGV0 aW5nUGF0aEV4dGVuc2lvbl0sIFtbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10gcHJvY2Vzc05h bWVdXTsKICAgICAKICAgICBOU0RpY3Rpb25hcnkgKmhvc3RQcm9wZXJ0aWVzID0gW1tOU0RpY3Rp b25hcnkgYWxsb2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB2aXNpYmxlTmFtZSwgQCJ2aXNpYmxlTmFtZSIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoTlNTdHJpbmcgKilbcGFja2FnZSBwYXRoXSwgQCJi dW5kbGVQYXRoIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChOU1N0cmlu ZyAqKXBsdWdpblBhdGgsIEAiYnVuZGxlUGF0aCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBuaWxdOwogICAgIAogICAgIGRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxp emF0aW9uIGRhdGFGcm9tUHJvcGVydHlMaXN0Omhvc3RQcm9wZXJ0aWVzIGZvcm1hdDpOU1Byb3Bl cnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIGVycm9yRGVzY3JpcHRpb246bmlsXTsKQEAgLTIxNSwx MCArMjE1LDEwIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6cGx1Z2luSG8KICAg ICB9CiB9CiAKLVBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5PiBOZXRzY2Fw ZVBsdWdpbkhvc3RNYW5hZ2VyOjppbnN0YW50aWF0ZVBsdWdpbihXZWJOZXRzY2FwZVBsdWdpblBh Y2thZ2UgKnBsdWdpblBhY2thZ2UsIFdlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyAqcGx1Z2lu VmlldywgTlNTdHJpbmcgKm1pbWVUeXBlLCBOU0FycmF5ICphdHRyaWJ1dGVLZXlzLCBOU0FycmF5 ICphdHRyaWJ1dGVWYWx1ZXMsIE5TU3RyaW5nICp1c2VyQWdlbnQsIE5TVVJMICpzb3VyY2VVUkws IGJvb2wgZnVsbEZyYW1lLCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKQorUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk+IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGx1Z2lu KGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUs IGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5W aWV3ICpwbHVnaW5WaWV3LCBOU1N0cmluZyAqbWltZVR5cGUsIE5TQXJyYXkgKmF0dHJpYnV0ZUtl eXMsIE5TQXJyYXkgKmF0dHJpYnV0ZVZhbHVlcywgTlNTdHJpbmcgKnVzZXJBZ2VudCwgTlNVUkwg KnNvdXJjZVVSTCwgYm9vbCBmdWxsRnJhbWUsIGJvb2wgaXNQcml2YXRlQnJvd3NpbmdFbmFibGVk LCBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpCiB7CiAgICAgV2ViUHJlZmVy ZW5jZXMgKnByZWZlcmVuY2VzID0gW1twbHVnaW5WaWV3IHdlYlZpZXddIHByZWZlcmVuY2VzXTsK LSAgICBOZXRzY2FwZVBsdWdpbkhvc3RQcm94eSogaG9zdFByb3h5ID0gaG9zdEZvclBhY2thZ2Uo cGx1Z2luUGFja2FnZSwgW3ByZWZlcmVuY2VzIHVzZXNQcm94aWVkT3BlblBhbmVsXSk7CisgICAg TmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqIGhvc3RQcm94eSA9IGhvc3RGb3JQbHVnaW4ocGx1Z2lu UGF0aCwgcGx1Z2luQXJjaGl0ZWN0dXJlLCBidW5kbGVJZGVudGlmaWVyLCBbcHJlZmVyZW5jZXMg dXNlc1Byb3hpZWRPcGVuUGFuZWxdKTsKICAgICBpZiAoIWhvc3RQcm94eSkKICAgICAgICAgcmV0 dXJuIDA7CiAKQEAgLTI1Nyw3ICsyNTcsNyBAQCBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eT4gCiAgICAgICAgIHBsdWdpbkhvc3REaWVkKGhvc3RQcm94eSk7CiAKICAgICAg ICAgLy8gVHJ5IHRvIHNwYXduIGl0IGFnYWluLgotICAgICAgICBob3N0UHJveHkgPSBob3N0Rm9y UGFja2FnZShwbHVnaW5QYWNrYWdlLCBbcHJlZmVyZW5jZXMgdXNlc1Byb3hpZWRPcGVuUGFuZWxd KTsKKyAgICAgICAgaG9zdFByb3h5ID0gaG9zdEZvclBsdWdpbihwbHVnaW5QYXRoLCBwbHVnaW5B cmNoaXRlY3R1cmUsIGJ1bmRsZUlkZW50aWZpZXIsIFtwcmVmZXJlbmNlcyB1c2VzUHJveGllZE9w ZW5QYW5lbF0pOwogICAgICAgICAKICAgICAgICAgLy8gQ3JlYXRlIGEgbmV3IGluc3RhbmNlLgog ICAgICAgICBpbnN0YW5jZSA9IE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Y3JlYXRlKGhv c3RQcm94eSwgcGx1Z2luVmlldywgZnVsbEZyYW1lKTsKQEAgLTI3NywxMSArMjc3LDExIEBAIFBh c3NSZWZQdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5PiAKICAgICByZXR1cm4gaW5zdGFu Y2UucmVsZWFzZSgpOwogfQogCi12b2lkIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OmNyZWF0 ZVByb3BlcnR5TGlzdEZpbGUoV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlICpwYWNrYWdlKQordm9p ZCBOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlKGNvbnN0 IFN0cmluZyYgcGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUpCiB7ICAg CiAgICAgTlNTdHJpbmcgKnBsdWdpbkhvc3RBcHBQYXRoID0gW1tOU0J1bmRsZSBidW5kbGVXaXRo SWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJLaXQiXSBwYXRoRm9yQXV4aWxpYXJ5RXhlY3V0YWJs ZTpwbHVnaW5Ib3N0QXBwTmFtZV07CiAgICAgTlNTdHJpbmcgKnBsdWdpbkhvc3RBcHBFeGVjdXRh YmxlUGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0aFBhdGg6cGx1Z2luSG9zdEFwcFBhdGhdIGV4 ZWN1dGFibGVQYXRoXTsKLSAgICBOU1N0cmluZyAqYnVuZGxlUGF0aCA9IFtwYWNrYWdlIHBhdGhd OworICAgIE5TU3RyaW5nICpidW5kbGVQYXRoID0gcGx1Z2luUGF0aDsKIAogICAgIHBpZF90IHBp ZDsKICAgICBwb3NpeF9zcGF3bmF0dHJfdCBhdHRyOwpAQCAtMjg5LDcgKzI4OSw3IEBAIHZvaWQg TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6Y3JlYXRlUHIKICAgICAKICAgICAvLyBTZXQgdGhl IGFyY2hpdGVjdHVyZS4KICAgICBzaXplX3Qgb2NvdW50ID0gMDsKLSAgICBpbnQgY3B1VHlwZXNb MV0gPSB7IFtwYWNrYWdlIHBsdWdpbkhvc3RBcmNoaXRlY3R1cmVdIH07CisgICAgaW50IGNwdVR5 cGVzW10gPSB7IHBsdWdpbkFyY2hpdGVjdHVyZSB9OwogICAgIHBvc2l4X3NwYXduYXR0cl9zZXRi aW5wcmVmX25wKCZhdHRyLCAxLCBjcHVUeXBlcywgJm9jb3VudCk7CiAgICAgCiAgICAgLy8gU3Bh d24gdGhlIHBsdWctaW4gaG9zdCBhbmQgdGVsbCBpdCB0byBjYWxsIHRoZSByZWdpc3RyYXRpb24g ZnVuY3Rpb24uCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNj YXBlUGx1Z2luVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVk L1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbQkocmV2aXNpb24gNjE2MTgpCisrKyBXZWJL aXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbQkod29y a2luZyBjb3B5KQpAQCAtMTExLDcgKzExMSw3IEBAIC0gKEJPT0wpY3JlYXRlUGx1Z2luCiAgICAg YWNjbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCA9IFtbW3NlbGYgd2ViVmlld10gcHJlZmVyZW5j ZXNdIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkXTsKICNlbmRpZgogICAgIAotICAgIF9w cm94eSA9IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNoYXJlZCgpLmluc3RhbnRpYXRlUGx1 Z2luKF9wbHVnaW5QYWNrYWdlLmdldCgpLCBzZWxmLCBfTUlNRVR5cGUuZ2V0KCksIF9hdHRyaWJ1 dGVLZXlzLmdldCgpLCBfYXR0cmlidXRlVmFsdWVzLmdldCgpLCB1c2VyQWdlbnQsIF9zb3VyY2VV UkwuZ2V0KCksIAorICAgIF9wcm94eSA9IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNoYXJl ZCgpLmluc3RhbnRpYXRlUGx1Z2luKFtfcGx1Z2luUGFja2FnZS5nZXQoKSBwYXRoXSwgW19wbHVn aW5QYWNrYWdlLmdldCgpIHBsdWdpbkhvc3RBcmNoaXRlY3R1cmVdLCBbX3BsdWdpblBhY2thZ2Uu Z2V0KCkgYnVuZGxlSWRlbnRpZmllcl0sIHNlbGYsIF9NSU1FVHlwZS5nZXQoKSwgX2F0dHJpYnV0 ZUtleXMuZ2V0KCksIF9hdHRyaWJ1dGVWYWx1ZXMuZ2V0KCksIHVzZXJBZ2VudCwgX3NvdXJjZVVS TC5nZXQoKSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgX21vZGUgPT0gTlBfRlVMTCwgX2lzUHJpdmF0ZUJyb3dzaW5n RW5hYmxlZCwgYWNjbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7CiAgICAgaWYgKCFfcHJveHkp IAogICAgICAgICByZXR1cm4gTk87Cg==