60894 2011-05-16 09:10:43 -0700 Short-circuit NPRuntime calls made by Flash during plug-in instantiation 2011-05-16 09:34:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 404518 0 andersca 2011-05-16 09:10:43 -0700 Short-circuit NPRuntime calls made by Flash during plug-in instantiation 404520 1 93652 andersca 2011-05-16 09:17:06 -0700 Created attachment 93652 Patch 404521 2 93652 mitz 2011-05-16 09:29:10 -0700 Comment on attachment 93652 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93652&action=review > Source/WebKit2/ChangeLog:13 > + Since we know what calls Flash are making and what results are expected, we can handle the Should this say “Flash is making”, since it says “Flash makes” in the first paragraph? > Source/WebKit2/ChangeLog:31 > + Check if the script string has the definitions of __flash_getWindowLocation or __flash_getTopLocation > + and just ignore them. Note that ignoring them has the effect of not adding them to the window object, Can the functions still be added, asynchronously? 404522 3 andersca 2011-05-16 09:34:02 -0700 (In reply to comment #2) > (From update of attachment 93652 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93652&action=review > > > Source/WebKit2/ChangeLog:13 > > + Since we know what calls Flash are making and what results are expected, we can handle the > > Should this say “Flash is making”, since it says “Flash makes” in the first paragraph? > Yes. > > Source/WebKit2/ChangeLog:31 > > + Check if the script string has the definitions of __flash_getWindowLocation or __flash_getTopLocation > > + and just ignore them. Note that ignoring them has the effect of not adding them to the window object, > > Can the functions still be added, asynchronously? Sure, but I don't think it's worth it. In the unlikely event that this is a problem we could re-evaluate (no pun intended) the decision. 404523 4 andersca 2011-05-16 09:34:15 -0700 Committed r86578: <http://trac.webkit.org/changeset/86578> 93652 2011-05-16 09:17:06 -0700 2011-05-16 09:29:10 -0700 Patch bug-60894-20110516091705.patch text/plain 10392 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTc3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMDUtMTYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTaG9ydC1jaXJjdWl0IE5QUnVudGltZSBjYWxscyBtYWRl IGJ5IEZsYXNoIGR1cmluZyBwbHVnLWluIGluc3RhbnRpYXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwODk0CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS84ODA0NjgxPgorCisgICAgICAgIER1cmluZyBwbHVnLWluIGluc3RhbnRpYXRpb24sIEZs YXNoIG1ha2VzIGEgY291cGxlIG9mIE5QUnVudGltZSBjYWxscyB0byBnZXQgdGhlCisgICAgICAg IFVSTCBvZiB0aGUgY3VycmVudCBkb2N1bWVudCBhcyB3ZWxsIGFzIHRoZSBVUkwgb2YgdGhlIHRv cGxldmVsIGRvY3VtZW50LiBUaGlzIGxlYWRzIHRvCisgICAgICAgIGEgYnVuY2ggb2YgSVBDIHRy YWZmaWMgdGhhdCBzbG93cyBkb3duIGluc3RhbnRpYXRpb24uCisKKyAgICAgICAgU2luY2Ugd2Ug a25vdyB3aGF0IGNhbGxzIEZsYXNoIGFyZSBtYWtpbmcgYW5kIHdoYXQgcmVzdWx0cyBhcmUgZXhw ZWN0ZWQsIHdlIGNhbiBoYW5kbGUgdGhlCisgICAgICAgIE5QUnVudGltZSBjYWxscyBkaXJlY3Rs eSBpbiB0aGUgcGx1Zy1pbiBwcm9jZXNzIGFuZCBhdm9pZCBleHRyYSBJUEMgb3ZlcmhlYWQuCisK KyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1Z2luQ29udHJvbGxlclByb3h5 KToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX3BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy4KKworICAg ICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OmluaXRpYWxpemUpOgorICAgICAg ICBTZXQgbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMgdG8gcG9pbnQgdG8gdGhlIGNyZWF0aW9u IHBhcmFtZXRlcnMgcmlnaHQgYmVmb3JlCisgICAgICAgIGNhbGxpbmcgUGx1Z2luOjppbml0aWFs aXplIGFuZCByZXN0b3JlIGl0IGJhY2sgYWZ0ZXJ3YXJkcy4KKworICAgICAgICAoV2ViS2l0OjpQ bHVnaW5Db250cm9sbGVyUHJveHk6OnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKToKKyAgICAgICAg SWYgdGhlIHBsdWctaW4gY2FsbGluZyBOUE5fSW52b2tlIGhhcyB0aGUgQ2FuU2hvcnRDaXJjdWl0 U29tZU5QUnVudGltZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRpb24KKyAgICAgICAgcXVpcmssIGFu ZCB3ZSdyZSBiZWluZyBpbml0aWFsaXplZCwgY2hlY2sgZm9yIHRoZSBfX2ZsYXNoX2dldFdpbmRv d0xvY2F0aW9uIGFuZAorICAgICAgICBfX2ZsYXNoX2dldFRvcExvY2F0aW9uIGZ1bmN0aW9uIGNh bGxzIGFuZCByZXR1cm4gdGhlIGNvcnJlY3QgdmFsdWVzLgorCisgICAgICAgIChXZWJLaXQ6OlBs dWdpbkNvbnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9ydENpcmN1aXRFdmFsdWF0ZSk6CisgICAgICAg IENoZWNrIGlmIHRoZSBzY3JpcHQgc3RyaW5nIGhhcyB0aGUgZGVmaW5pdGlvbnMgb2YgX19mbGFz aF9nZXRXaW5kb3dMb2NhdGlvbiBvciBfX2ZsYXNoX2dldFRvcExvY2F0aW9uCisgICAgICAgIGFu ZCBqdXN0IGlnbm9yZSB0aGVtLiBOb3RlIHRoYXQgaWdub3JpbmcgdGhlbSBoYXMgdGhlIGVmZmVj dCBvZiBub3QgYWRkaW5nIHRoZW0gdG8gdGhlIHdpbmRvdyBvYmplY3QsCisgICAgICAgIHdoaWNo IGNvdWxkIGluIHRoZW9yeSBiZSBhIGJhY2t3YXJkcyBjb21wYXRpYmlsaXR5IHByb2JsZW0gaWYg d2ViIHBhZ2VzIHdlcmUgdG8gYXNzdW1lIHRoYXQgdGhlc2UKKyAgICAgICAgZnVuY3Rpb25zIGV4 aXN0ZWQgb24gYSBwYWdlIHdpdGggcGx1Zy1pbnMuIEluIHByYWN0aWNlIHRoaXMgaXMgcHJvYmFi bHkgbm90IGEgcHJvYmxlbSwgZXNwZWNpYWxseSBzaW5jZQorICAgICAgICB0aGVzZSBmdW5jdGlv bnMgYXJlIG9ubHkgdXNlZCBvbiBNYWMgV2ViS2l0LgorCisgICAgICAgICogUGx1Z2luUHJvY2Vz cy9QbHVnaW5Db250cm9sbGVyUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJv bGxlclByb3h5OjppbkluaXRpYWxpemUpOgorICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9uLgor CisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9k dWxlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6ZGV0ZXJt aW5lUXVpcmtzKToKKyAgICAgICAgQWRkIHRoZSBDYW5TaG9ydENpcmN1aXRTb21lTlBSdW50aW1l Q2FsbHNEdXJpbmdJbml0aWFsaXphdGlvbiBxdWlyayBmb3IgRmxhc2ggb24gTWFjLgorCisgICAg ICAgICogU2hhcmVkL1BsdWdpbnMvUGx1Z2luUXVpcmtzLmg6CisgICAgICAgIEFkZCBNYWMgc3Bl Y2lmaWMgQ2FuU2hvcnRDaXJjdWl0U29tZU5QUnVudGltZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRp b24gcXVpcmsuCisKIDIwMTEtMDUtMTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogU291cmNlL1dl YktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNw cAkocmV2aXNpb24gODY1NzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdp bkNvbnRyb2xsZXJQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAKICNp bmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzQ29u bmVjdGlvbi5oIgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CisjaW5jbHVk ZSA8V2ViQ29yZS9JZGVudGlmaWVyUmVwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1l bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC02NCw2ICs2NSw3 IEBAIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1Z2luQ29udHJvbGxlclAKICAgICAsIG1fcGFp bnRUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZQbHVnaW5Db250cm9sbGVyUHJveHk6OnBh aW50KQogICAgICwgbV9wbHVnaW5EZXN0cnVjdGlvblByb3RlY3RDb3VudCgwKQogICAgICwgbV9w bHVnaW5EZXN0cm95VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUGx1Z2luQ29udHJvbGxl clByb3h5OjpkZXN0cm95KQorICAgICwgbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMoMCkKICAg ICAsIG1fd2FpdGluZ0ZvckRpZFVwZGF0ZShmYWxzZSkKICAgICAsIG1fcGx1Z2luQ2FuY2VsZWRN YW51YWxTdHJlYW1Mb2FkKGZhbHNlKQogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTk5LDcgKzEwMSwx MSBAQCBib29sIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6aW5pdGlhbGl6ZShjCiAgICAgbV93aW5k b3dOUE9iamVjdCA9IG1fY29ubmVjdGlvbi0+bnBSZW1vdGVPYmplY3RNYXAoKS0+Y3JlYXRlTlBP YmplY3RQcm94eShjcmVhdGlvblBhcmFtZXRlcnMud2luZG93TlBPYmplY3RJRCwgbV9wbHVnaW4u Z2V0KCkpOwogICAgIEFTU0VSVChtX3dpbmRvd05QT2JqZWN0KTsKIAotICAgIGlmICghbV9wbHVn aW4tPmluaXRpYWxpemUodGhpcywgY3JlYXRpb25QYXJhbWV0ZXJzLnBhcmFtZXRlcnMpKSB7Cisg ICAgbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMgPSAmY3JlYXRpb25QYXJhbWV0ZXJzOworICAg IGJvb2wgcmV0dXJuVmFsdWUgPSBtX3BsdWdpbi0+aW5pdGlhbGl6ZSh0aGlzLCBjcmVhdGlvblBh cmFtZXRlcnMucGFyYW1ldGVycyk7CisgICAgbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMgPSAw OworCisgICAgaWYgKCFyZXR1cm5WYWx1ZSkgewogICAgICAgICAvLyBHZXQgdGhlIHBsdWctaW4g c28gd2UgY2FuIHBhc3MgaXQgdG8gcmVtb3ZlUGx1Z2luQ29udHJvbGxlclByb3h5LiBUaGUgcG9p bnRlciBpcyBvbmx5CiAgICAgICAgIC8vIHVzZWQgYXMgYW4gaWRlbnRpZmllciBzbyBpdCdzIE9L IHRvIGp1c3QgZ2V0IGEgd2VhayByZWZlcmVuY2UuCiAgICAgICAgIFBsdWdpbiogcGx1Z2luID0g bV9wbHVnaW4uZ2V0KCk7CkBAIC0yODEsOCArMjg3LDQ4IEBAIGJvb2wgUGx1Z2luQ29udHJvbGxl clByb3h5OjpldmFsdWF0ZShOUE8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBQbHVnaW5D b250cm9sbGVyUHJveHk6OnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKE5QT2JqZWN0KiwgTlBJZGVu dGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBh cmd1bWVudENvdW50LCBib29sJiByZXR1cm5WYWx1ZSwgTlBWYXJpYW50JiByZXN1bHQpCitib29s IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBPYmplY3Qq IG5wT2JqZWN0LCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1 bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIGJvb2wmIHJldHVyblZhbHVlLCBOUFZhcmlh bnQmIHJlc3VsdCkKIHsKKyAgICAvLyBPbmx5IHRyeSB0byBzaG9ydCBjaXJjdWl0IGV2YWx1YXRl IGZvciBwbHVnLWlucyB0aGF0IGhhdmUgdGhlIHF1aXJrIHNwZWNpZmllZC4KKyAgICBpZiAoIVBs dWdpblByb2Nlc3M6OnNoYXJlZCgpLm5ldHNjYXBlUGx1Z2luTW9kdWxlKCktPnBsdWdpblF1aXJr cygpLmNvbnRhaW5zKFBsdWdpblF1aXJrczo6Q2FuU2hvcnRDaXJjdWl0U29tZU5QUnVudGltZUNh bGxzRHVyaW5nSW5pdGlhbGl6YXRpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisg ICAgLy8gQW5kIG9ubHkgd2hlbiB3ZSdyZSBpbiBpbml0aWFsaXplLgorICAgIGlmICghaW5Jbml0 aWFsaXplKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICAvLyBBbmQgb25seSB3 aGVuIHRoZSBOUE9iamVjdCBpcyB0aGUgd2luZG93IE5QT2JqZWN0LgorICAgIGlmIChucE9iamVj dCAhPSBtX3dpbmRvd05QT2JqZWN0KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBB bmQgb25seSB3aGVuIHdlIGRvbid0IGhhdmUgYW55IGFyZ3VtZW50cy4KKyAgICBpZiAoYXJndW1l bnRDb3VudCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgSWRlbnRpZmllclJlcCogbWV0 aG9kTmFtZVJlcCA9IHN0YXRpY19jYXN0PElkZW50aWZpZXJSZXAqPihtZXRob2ROYW1lKTsKKyAg ICBpZiAoIW1ldGhvZE5hbWVSZXAtPmlzU3RyaW5nKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgIGlmICghc3RyY21wKG1ldGhvZE5hbWVSZXAtPnN0cmluZygpLCAiX19mbGFzaF9nZXRX aW5kb3dMb2NhdGlvbiIpKSB7CisgICAgICAgIHJlc3VsdC50eXBlID0gTlBWYXJpYW50VHlwZV9T dHJpbmc7CisgICAgICAgIHJlc3VsdC52YWx1ZS5zdHJpbmdWYWx1ZSA9IGNyZWF0ZU5QU3RyaW5n KG1fcGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLT5wYXJhbWV0ZXJzLmRvY3VtZW50VVJMLnV0Zjgo KSk7IAorICAgICAgICByZXR1cm5WYWx1ZSA9IHRydWU7CisgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0KKyAgICAKKyAgICBpZiAoIXN0cmNtcChtZXRob2ROYW1lUmVwLT5zdHJpbmcoKSwgIl9f Zmxhc2hfZ2V0VG9wTG9jYXRpb24iKSkgeworICAgICAgICBpZiAobV9wbHVnaW5DcmVhdGlvblBh cmFtZXRlcnMtPnBhcmFtZXRlcnMudG9wbGV2ZWxEb2N1bWVudFVSTC5pc051bGwoKSkgeworICAg ICAgICAgICAgLy8gSWYgdGhlIHRvcGxldmVsIGRvY3VtZW50IGlzIFVSTCBpdCBtZWFucyB0aGF0 IHRoZSBmcmFtZSB0aGF0IHRoZSBwbHVnLWluIGlzIGluIGRvZXNuJ3QgaGF2ZSBhY2Nlc3MgdG8g dGhlIHRvcGxldmVsIGRvY3VtZW50LgorICAgICAgICAgICAgcmV0dXJuVmFsdWUgPSBmYWxzZTsK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgcmVzdWx0LnR5 cGUgPSBOUFZhcmlhbnRUeXBlX1N0cmluZzsKKyAgICAgICAgcmVzdWx0LnZhbHVlLnN0cmluZ1Zh bHVlID0gY3JlYXRlTlBTdHJpbmcobV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMtPnBhcmFtZXRl cnMudG9wbGV2ZWxEb2N1bWVudFVSTC51dGY4KCkpOyAKKyAgICAgICAgcmV0dXJuVmFsdWUgPSB0 cnVlOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKQEAgLTU0Miw3ICs1ODgsMjUgQEAgdm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnByaXZh dGVCcm93cwogCiBib29sIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9ydENpcmN1aXRF dmFsdWF0ZShOUE9iamVjdCogbnBPYmplY3QsIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBO UFZhcmlhbnQqIHJlc3VsdCkKIHsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgLy8gT25seSB0cnkg dG8gc2hvcnQgY2lyY3VpdCBldmFsdWF0ZSBmb3IgcGx1Zy1pbnMgdGhhdCBoYXZlIHRoZSBxdWly ayBzcGVjaWZpZWQuCisgICAgaWYgKCFQbHVnaW5Qcm9jZXNzOjpzaGFyZWQoKS5uZXRzY2FwZVBs dWdpbk1vZHVsZSgpLT5wbHVnaW5RdWlya3MoKS5jb250YWlucyhQbHVnaW5RdWlya3M6OkNhblNo b3J0Q2lyY3VpdFNvbWVOUFJ1bnRpbWVDYWxsc0R1cmluZ0luaXRpYWxpemF0aW9uKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gQW5kIG9ubHkgd2hlbiB3ZSdyZSBpbiBpbml0aWFs aXplLgorICAgIGlmICghaW5Jbml0aWFsaXplKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIC8vIEFuZCBvbmx5IHdoZW4gdGhlIE5QT2JqZWN0IGlzIHRoZSB3aW5kb3cgTlBPYmplY3Qu CisgICAgaWYgKG5wT2JqZWN0ICE9IG1fd2luZG93TlBPYmplY3QpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIC8vIE5vdywgY2hlY2sgZm9yIHRoZSByaWdodCBzdHJpbmdzLgorICAgIGlm IChzY3JpcHRTdHJpbmcgIT0gImZ1bmN0aW9uIF9fZmxhc2hfZ2V0V2luZG93TG9jYXRpb24oKSB7 IHJldHVybiB3aW5kb3cubG9jYXRpb247IH0iCisgICAgICAgICYmIHNjcmlwdFN0cmluZyAhPSAi ZnVuY3Rpb24gX19mbGFzaF9nZXRUb3BMb2NhdGlvbigpIHsgcmV0dXJuIHRvcC5sb2NhdGlvbjsg fSIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFZPSURfVE9fTlBWQVJJQU5UKCpyZXN1 bHQpOworICAgIHJldHVybiB0cnVlOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVy UHJveHkuaAkocmV2aXNpb24gODY1NzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNz L1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDMsNiArMTQzLDgg QEAgcHJpdmF0ZToKIAogICAgIGJvb2wgdHJ5VG9TaG9ydENpcmN1aXRFdmFsdWF0ZShOUE9iamVj dCosIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBOUFZhcmlhbnQqIHJlc3VsdCk7CiAKKyAg ICBib29sIGluSW5pdGlhbGl6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luQ3JlYXRpb25QYXJh bWV0ZXJzOyB9CisKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwogICAgIHZvaWQgcGxh dGZvcm1EZXN0cm95KCk7CiAgICAgdm9pZCBwbGF0Zm9ybUdlb21ldHJ5RGlkQ2hhbmdlKCk7CkBA IC0xNzMsNiArMTc1LDkgQEAgcHJpdmF0ZToKICAgICAvLyBjb2RlIGlzIG9uIHRoZSBzdGFjay4K ICAgICBSdW5Mb29wOjpUaW1lcjxQbHVnaW5Db250cm9sbGVyUHJveHk+IG1fcGx1Z2luRGVzdHJv eVRpbWVyOwogCisgICAgLy8gV2lsbCBwb2ludCB0byB0aGUgcGx1Zy1pbiBjcmVhdGlvbiBwYXJh bWV0ZXJzIG9mIHRoZSBwbHVnLWluIHdlJ3JlIGN1cnJlbnRseSBpbml0aWFsaXppbmcgYW5kIHdp bGwgYmUgbnVsbCB3aGVuIHdlJ3JlIGRvbmUgaW5pdGlhbGl6aW5nLgorICAgIGNvbnN0IFBsdWdp bkNyZWF0aW9uUGFyYW1ldGVycyogbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnM7CisKICAgICAv LyBXaGV0aGVyIHdlJ3JlIHdhaXRpbmcgZm9yIHRoZSBwbHVnLWluIHByb3h5IGluIHRoZSB3ZWIg cHJvY2VzcyB0byBkcmF3IHRoZSBjb250ZW50cyBvZiBpdHMKICAgICAvLyBiYWNraW5nIHN0b3Jl IGludG8gdGhlIHdlYiBwcm9jZXNzIGJhY2tpbmcgc3RvcmUuCiAgICAgYm9vbCBtX3dhaXRpbmdG b3JEaWRVcGRhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5R dWlya3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVn aW5RdWlya3MuaAkocmV2aXNpb24gODY1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1 Z2lucy9QbHVnaW5RdWlya3MuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsMTIgQEAgcHVi bGljOgogICAgICAgICAvLyB0cmFuc3BhcmVudC4KICAgICAgICAgTWFrZVRyYW5zcGFyZW50SWZC YWNrZ3JvdW5kQXR0cmlidXRlRXhpc3RzLAogCisgICAgICAgIC8vIFdoZXRoZXIgd2UgY2FuIHNo b3J0IGNpcmN1aXQgc29tZSBOUFJ1bnRpbWUgY2FsbHMgZHVyaW5nIHBsdWctaW4gaW5pdGlhbGl6 YXRpb24uCisgICAgICAgIC8vIFRoZSBGbGFzaCBwbHVnLWluIHVzZXMgTlBSdW50aW1lIHRvIGZp Z3VyZSBvdXQgdGhlIFVSTCBvZiB0aGUgZnJhbWUgaXQgaXMgaW4sIGFzIHdlbGwKKyAgICAgICAg Ly8gYXMgdGhlIFVSTCBvZiB0aGUgbWFpbiBmcmFtZS4gU2luY2Ugd2Uga25vdyB0aGUgZXhhY3Qg TlBSdW50aW1lIGNhbGxzIHRoZSBwbHVnLWluIG1ha2VzLAorICAgICAgICAvLyB3ZSBjYW4gcmV0 dXJuIHRoZSByaWdodCB2YWx1ZXMgd2l0aG91dCBoYXZpbmcgdG8gZG8gc3luYyBJUEMgYmFjayBp bnRvIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAgICAgQ2FuU2hvcnRDaXJjdWl0U29tZU5QUnVudGlt ZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRpb24sCisKICNpZm5kZWYgTlBfTk9fUVVJQ0tEUkFXCiAg ICAgICAgIC8vIEFsbG93IHRoZSBwbHVnLWluIHRvIHVzZSB0aGUgUXVpY2tEcmF3IGRyYXdpbmcg bW9kZWwsIHNpbmNlIHdlIGtub3cgdGhhdCB0aGUgcGx1Zy1pbgogICAgICAgICAvLyB3aWxsIG5l dmVyIHBhaW50IG9yIHJlY2VpdmUgZXZlbnRzLiBVc2VkIGJ5IHRoZSBBcHBsZUNvbm5lY3QgcGx1 Zy1pbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21hYy9O ZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0JKHJl dmlzaW9uIDg2NTE0KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUv bWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MTUsNiAr NDE1LDkgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbk1vZHVsZTo6ZGV0ZXJtaW5lUXVpcgogCiAgICAg ICAgIC8vIEZsYXNoIHN1cHBvcnRzIHNuYXBzaG90dGluZy4KICAgICAgICAgbV9wbHVnaW5RdWly a3MuYWRkKFBsdWdpblF1aXJrczo6U3VwcG9ydHNTbmFwc2hvdHRpbmcpOworCisgICAgICAgIC8v IFdlIGNhbiBzaG9ydCBjaXJjdWl0IHNvbWUgTlBSdW50aW1lIGNhbGxzIGR1cmluZyBpbml0aWFs aXphdGlvbi4KKyAgICAgICAgbV9wbHVnaW5RdWlya3MuYWRkKFBsdWdpblF1aXJrczo6Q2FuU2hv cnRDaXJjdWl0U29tZU5QUnVudGltZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRpb24pOwogICAgIH0K IAogICAgIGlmIChwbHVnaW4uYnVuZGxlSWRlbnRpZmllciA9PSAiY29tLm1pY3Jvc29mdC5TaWx2 ZXJsaWdodFBsdWdpbiIpIHsK