54686 2011-02-17 13:38:55 -0800 Web and/or plug-in process crashes when NPN_Evaluate destroys the plug-in 2011-02-20 11:30:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca mitz oldest_to_newest 353151 0 andersca 2011-02-17 13:38:55 -0800 Web and/or plug-in process crashes when NPN_Evaluate destroys the plug-in 353152 1 82857 andersca 2011-02-17 13:45:53 -0800 Created attachment 82857 Patch 353155 2 andersca 2011-02-17 13:50:17 -0800 Committed r78915: <http://trac.webkit.org/changeset/78915> 354300 3 mitz 2011-02-20 11:30:20 -0800 <rdar://problem/9013384> 82857 2011-02-17 13:45:53 -0800 2011-02-17 13:49:21 -0800 Patch bug-54686-20110217134551.patch text/plain 13513 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4OTE0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMDItMTcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgYW5kL29yIHBsdWctaW4gcHJvY2VzcyBjcmFzaGVz IHdoZW4gTlBOX0V2YWx1YXRlIGRlc3Ryb3lzIHRoZSBwbHVnLWluCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY4NgorICAgICAgICA8cmRhcjovL3By b2JsZW0vOTAxMzM4ND4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHR3byBidWdzIHdpdGgg YSBwbHVnLWluIGNhbGxpbmcgTlBOX0V2YWx1YXRlIHRvIGRlc3Ryb3kgaXRzZWxmOgorCisgICAg ICAgIC0gVGhlIFBsdWdpblByb3h5IG9iamVjdCB3b3VsZCBiZSBkZXN0cm95ZWQgaW4gdGhlIG1p ZGRsZSBvZiBQbHVnaW5Qcm94eTo6ZXZhbHVhdGUuCisgICAgICAgICAgVGhpcyB3b3VsZCBjYXVz ZSB0aGUgd2ViIHByb2Nlc3MgdG8gY3Jhc2guCisKKyAgICAgICAgLSBUaGUgUGx1Z2luQ29udHJv bGxlclByb3h5IHdvdWxkIGNhbGwgTlBQX0Rlc3Ryb3kgd2hpbGUgdGhlIHBsdWctaW4gd2FzIGJ1 c3kgcnVubmluZworICAgICAgICAgIGNvZGUuIFRoaXMgd291bGQgY2F1c2UgdGhlIHBsdWctaW4g cHJvY2VzcyB0byBjcmFzaC4KKworICAgICAgICBUbyBmaXggdGhpcywgd2UgYWRkIHByb3RlY3RQ bHVnaW5Gcm9tRGVzdHJ1Y3Rpb24vdW5wcm90ZWN0UGx1Z2luRnJvbURlc3RydWN0aW9uIHRvCisg ICAgICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eSBhbmQgdXNlIGl0IHRvIGRlZmVyIGNhbGxpbmcg ZGVzdHJveSgpIGluIHRoZSBwbHVnLWluIHByb2Nlc3MsCisgICAgICAgIGFuZCBkZWZlciBhY3R1 YWxseSBkZXN0cm95aW5nIHRoZSBwbHVnLWluIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQxNzEgdHJhY2tzIGFk ZGluZyBhIHRlc3QgZm9yIHRoaXMuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNv bnRyb2xsZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94 eTo6UGx1Z2luQ29udHJvbGxlclByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJv bGxlclByb3h5OjpkZXN0cm95KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclBy b3h5OjpldmFsdWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6 cHJvdGVjdFBsdWdpbkZyb21EZXN0cnVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNv bnRyb2xsZXJQcm94eTo6dW5wcm90ZWN0UGx1Z2luRnJvbURlc3RydWN0aW9uKToKKyAgICAgICAg KiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oOgorICAgICAgICAoV2ViS2l0 OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OmFzUGx1Z2luQ29udHJvbGxlcik6CisgICAgICAgICog UGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NDb25uZWN0aW9uOjpkZXN0cm95UGx1Z2luQ29udHJvbGxlclByb3h5KToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVNZXNzYWdlKToK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVTeW5jTWVz c2FnZSk6CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y29ubmVjdGlvbik6CisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKFdl YktpdDo6UGx1Z2luQ29udHJvbGxlcjo6UGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3I6OlBsdWdp bkRlc3RydWN0aW9uUHJvdGVjdG9yKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxl cjo6UGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3I6On5QbHVnaW5EZXN0cnVjdGlvblByb3RlY3Rv cik6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luUHJveHk6OmV2YWx1YXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnBy b3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3 Ojp1bnByb3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rpb24pOgorICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisKIDIwMTEtMDItMTcgIFNhbSBXZWluaWcgIDxzYW1Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXguCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCShyZXZpc2lv biA3ODkxMCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxl clByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgsOCBAQCBQbHVnaW5Db250cm9s bGVyUHJveHk6OlBsdWdpbkNvbnRyb2xsZXJQCiAgICAgLCBtX2lzUHJpdmF0ZUJyb3dzaW5nRW5h YmxlZChpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQpCiAgICAgLCBtX2lzQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWQoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCkKICAgICAsIG1f cGFpbnRUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZQbHVnaW5Db250cm9sbGVyUHJveHk6 OnBhaW50KQorICAgICwgbV9wbHVnaW5EZXN0cnVjdGlvblByb3RlY3RDb3VudCgwKQorICAgICwg bV9zaG91bGREZXN0cm95UGx1Z2luV2hlbkNvdW50UmVhY2hlc1plcm8oZmFsc2UpCiAgICAgLCBt X3dhaXRpbmdGb3JEaWRVcGRhdGUoZmFsc2UpCiAgICAgLCBtX3BsdWdpbkNhbmNlbGVkTWFudWFs U3RyZWFtTG9hZChmYWxzZSkKICNpZiBQTEFURk9STShNQUMpCkBAIC05MywxMCArOTUsMjAgQEAg dm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OmRlc3Ryb3koKQogewogICAgIEFTU0VSVChtX3Bs dWdpbik7CiAKKyAgICBpZiAobV9wbHVnaW5EZXN0cnVjdGlvblByb3RlY3RDb3VudCkgeworICAg ICAgICAvLyBXZSBoYXZlIHBsdWctaW4gY29kZSBvbiB0aGUgc3RhY2sgc28gd2UgY2FuJ3QgZGVz dHJveSBpdCByaWdodCBub3cuCisgICAgICAgIC8vIERlc3Ryb3kgaXQgbGF0ZXIuCisgICAgICAg IG1fc2hvdWxkRGVzdHJveVBsdWdpbldoZW5Db3VudFJlYWNoZXNaZXJvID0gdHJ1ZTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKwogICAgIG1fcGx1Z2luLT5kZXN0cm95KCk7CiAgICAgbV9wbHVn aW4gPSAwOwogCiAgICAgcGxhdGZvcm1EZXN0cm95KCk7CisKKyAgICAvLyBUaGlzIHdpbGwgZGVs ZXRlIHRoZSBwbHVnLWluIGNvbnRyb2xsZXIgcHJveHkgb2JqZWN0LgorICAgIG1fY29ubmVjdGlv bi0+cmVtb3ZlUGx1Z2luQ29udHJvbGxlclByb3h5KHRoaXMpOwogfQogCiB2b2lkIFBsdWdpbkNv bnRyb2xsZXJQcm94eTo6cGFpbnQoKQpAQCAtMjA1LDYgKzIxNyw4IEBAIE5QT2JqZWN0KiBQbHVn aW5Db250cm9sbGVyUHJveHk6OnBsdWdpbkUKIAogYm9vbCBQbHVnaW5Db250cm9sbGVyUHJveHk6 OmV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3QgU3RyaW5nJiBzY3JpcHRTdHJpbmcs IE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9wdXBzKQogeworICAgIFBsdWdpbkRlc3Ry dWN0aW9uUHJvdGVjdG9yIHByb3RlY3Rvcih0aGlzKTsKKwogICAgIE5QVmFyaWFudCBucE9iamVj dEFzTlBWYXJpYW50OwogICAgIE9CSkVDVF9UT19OUFZBUklBTlQobnBPYmplY3QsIG5wT2JqZWN0 QXNOUFZhcmlhbnQpOwogCkBAIC0yODUsNiArMjk5LDIwIEBAIGJvb2wgUGx1Z2luQ29udHJvbGxl clByb3h5Ojppc1ByaXZhdGVCcm8KICAgICByZXR1cm4gbV9pc1ByaXZhdGVCcm93c2luZ0VuYWJs ZWQ7CiB9CiAKK3ZvaWQgUGx1Z2luQ29udHJvbGxlclByb3h5Ojpwcm90ZWN0UGx1Z2luRnJvbURl c3RydWN0aW9uKCkKK3sKKyAgICBtX3BsdWdpbkRlc3RydWN0aW9uUHJvdGVjdENvdW50Kys7Cit9 CisKK3ZvaWQgUGx1Z2luQ29udHJvbGxlclByb3h5Ojp1bnByb3RlY3RQbHVnaW5Gcm9tRGVzdHJ1 Y3Rpb24oKQoreworICAgIEFTU0VSVChtX3BsdWdpbkRlc3RydWN0aW9uUHJvdGVjdENvdW50KTsK KworICAgIG1fcGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0Q291bnQtLTsKKyAgICBpZiAoIW1fcGx1 Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0Q291bnQgJiYgbV9zaG91bGREZXN0cm95UGx1Z2luV2hlbkNv dW50UmVhY2hlc1plcm8pCisgICAgICAgIGRlc3Ryb3koKTsKK30KKwogdm9pZCBQbHVnaW5Db250 cm9sbGVyUHJveHk6OmZyYW1lRGlkRmluaXNoTG9hZGluZyh1aW50NjRfdCByZXF1ZXN0SUQpCiB7 CiAgICAgbV9wbHVnaW4tPmZyYW1lRGlkRmluaXNoTG9hZGluZyhyZXF1ZXN0SUQpOwpJbmRleDog U291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQ cm94eS5oCShyZXZpc2lvbiA3ODkxMCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3Mv UGx1Z2luQ29udHJvbGxlclByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDYgKzY5LDggQEAg cHVibGljOgogICAgIHVpbnQzMl90IHJlbW90ZUxheWVyQ2xpZW50SUQoKSBjb25zdDsKICNlbmRp ZgogCisgICAgUGx1Z2luQ29udHJvbGxlciogYXNQbHVnaW5Db250cm9sbGVyKCkgeyByZXR1cm4g dGhpczsgfQorCiBwcml2YXRlOgogICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eShXZWJQcm9jZXNz Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCwgY29uc3Qg U3RyaW5nJiB1c2VyQWdlbnQsIGJvb2wgaXNQcml2YXRlQnJvd3NpbmdFbmFibGVkLCBib29sIGlz QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpOwogCkBAIC05Nyw2ICs5OSw4IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCBTdHJpbmcgY29va2llc0ZvclVSTChjb25zdCBTdHJpbmcmKTsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0Q29va2llc0ZvclVSTChjb25zdCBTdHJpbmcmIHVybFN0cmluZywg Y29uc3QgU3RyaW5nJiBjb29raWVTdHJpbmcpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ByaXZhdGVC cm93c2luZ0VuYWJsZWQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgcHJvdGVjdFBsdWdpbkZyb21EZXN0 cnVjdGlvbigpOworICAgIHZpcnR1YWwgdm9pZCB1bnByb3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rp b24oKTsKICAgICAKICAgICAvLyBNZXNzYWdlIGhhbmRsZXJzLgogICAgIHZvaWQgZnJhbWVEaWRG aW5pc2hMb2FkaW5nKHVpbnQ2NF90IHJlcXVlc3RJRCk7CkBAIC0xNTIsNiArMTU2LDEyIEBAIHBy aXZhdGU6CiAKICAgICAvLyBUaGUgcGFpbnQgdGltZXIsIHVzZWQgZm9yIGNvYWxlc2NpbmcgcGFp bnRpbmcuCiAgICAgUnVuTG9vcDo6VGltZXI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBtX3BhaW50 VGltZXI7CisgICAgCisgICAgLy8gQSBjb3VudGVyIHVzZWQgdG8gcHJldmVudCB0aGUgcGx1Zy1p biBmcm9tIGJlaW5nIGRlc3Ryb3llZC4KKyAgICB1bnNpZ25lZCBtX3BsdWdpbkRlc3RydWN0aW9u UHJvdGVjdENvdW50OworICAgIAorICAgIC8vIFdoZXRoZXIgd2Ugc2hvdWxkIGRlc3Ryb3kgdGhl IHBsdWctaW4gd2hlbiB0aGUgY291bnQgcmVhY2hlcyAwLgorICAgIGJvb2wgbV9zaG91bGREZXN0 cm95UGx1Z2luV2hlbkNvdW50UmVhY2hlc1plcm87CiAKICAgICAvLyBXaGV0aGVyIHdlJ3JlIHdh aXRpbmcgZm9yIHRoZSBwbHVnLWluIHByb3h5IGluIHRoZSB3ZWIgcHJvY2VzcyB0byBkcmF3IHRo ZSBjb250ZW50cyBvZiBpdHMKICAgICAvLyBiYWNraW5nIHN0b3JlIGludG8gdGhlIHdlYiBwcm9j ZXNzIGJhY2tpbmcgc3RvcmUuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dl YlByb2Nlc3NDb25uZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcAkocmV2aXNpb24gNzg5MTApCisrKyBT b3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjUsMTAgKzY1LDkgQEAgdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6 YWRkUGx1Z2luQ29udAogCiB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkZXN0cm95UGx1Z2lu Q29udHJvbGxlclByb3h5KFBsdWdpbkNvbnRyb2xsZXJQcm94eSogcGx1Z2luQ29udHJvbGxlcikK IHsKKyAgICAvLyBUaGlzIG1heSBlbmQgdXAgY2FsbGluZyByZW1vdmVQbHVnaW5Db250cm9sbGVy UHJveHkgd2hpY2ggZW5kcyB1cCBkZWxldGluZworICAgIC8vIHRoZSBXZWJQcm9jZXNzQ29ubmVj dGlvbiBvYmplY3QgaWYgdGhpcyB3YXMgdGhlIGxhc3Qgb2JqZWN0LgogICAgIHBsdWdpbkNvbnRy b2xsZXItPmRlc3Ryb3koKTsKLSAgICAKLSAgICAvLyBUaGlzIHdpbGwgZGVsZXRlIHRoZSBwbHVn LWluIGNvbnRyb2xsZXIgcHJveHkgb2JqZWN0LgotICAgIHJlbW92ZVBsdWdpbkNvbnRyb2xsZXJQ cm94eShwbHVnaW5Db250cm9sbGVyKTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6 cmVtb3ZlUGx1Z2luQ29udHJvbGxlclByb3h5KFBsdWdpbkNvbnRyb2xsZXJQcm94eSogcGx1Z2lu Q29udHJvbGxlcikKQEAgLTEwMSw5ICsxMDAsMTQgQEAgdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlv bjo6ZGlkUmVjZWl2ZU1lcwogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICAKLSAgICBpZiAoUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVn aW5Db250cm9sbGVyUHJveHkgPSBtX3BsdWdpbkNvbnRyb2xsZXJzLmdldChhcmd1bWVudHMtPmRl c3RpbmF0aW9uSUQoKSkpCi0gICAgICAgIHBsdWdpbkNvbnRyb2xsZXJQcm94eS0+ZGlkUmVjZWl2 ZVBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1 bWVudHMpOworCisgICAgUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVnaW5Db250cm9sbGVyUHJv eHkgPSBtX3BsdWdpbkNvbnRyb2xsZXJzLmdldChhcmd1bWVudHMtPmRlc3RpbmF0aW9uSUQoKSk7 CisgICAgaWYgKCFwbHVnaW5Db250cm9sbGVyUHJveHkpCisgICAgICAgIHJldHVybjsKKworICAg IFBsdWdpbkNvbnRyb2xsZXI6OlBsdWdpbkRlc3RydWN0aW9uUHJvdGVjdG9yIHByb3RlY3Rvcihw bHVnaW5Db250cm9sbGVyUHJveHktPmFzUGx1Z2luQ29udHJvbGxlcigpKTsKKworICAgIHBsdWdp bkNvbnRyb2xsZXJQcm94eS0+ZGlkUmVjZWl2ZVBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2Uo Y29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMpOwogfQogCiBDb3JlSVBDOjpTeW5jUmVw bHlNb2RlIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQ Qzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwg Q29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIENvcmVJUEM6OkFyZ3VtZW50RW5j b2RlciogcmVwbHkpCkBAIC0xMTYsMTAgKzEyMCwxNCBAQCBDb3JlSVBDOjpTeW5jUmVwbHlNb2Rl IFdlYlByb2Nlc3NDb25uZWN0CiAgICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdl Q2xhc3NOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcj4oKSkKICAgICAgICAgcmV0dXJuIG1fbnBSZW1v dGVPYmplY3RNYXAtPmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQs IGFyZ3VtZW50cywgcmVwbHkpOwogCi0gICAgaWYgKFBsdWdpbkNvbnRyb2xsZXJQcm94eSogcGx1 Z2luQ29udHJvbGxlclByb3h5ID0gbV9wbHVnaW5Db250cm9sbGVycy5nZXQoZGVzdGluYXRpb25J RCkpCi0gICAgICAgIHJldHVybiBwbHVnaW5Db250cm9sbGVyUHJveHktPmRpZFJlY2VpdmVTeW5j UGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3Vt ZW50cywgcmVwbHkpOworICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eSogcGx1Z2luQ29udHJvbGxl clByb3h5ID0gbV9wbHVnaW5Db250cm9sbGVycy5nZXQoYXJndW1lbnRzLT5kZXN0aW5hdGlvbklE KCkpOworICAgIGlmICghcGx1Z2luQ29udHJvbGxlclByb3h5KQorICAgICAgICByZXR1cm4gQ29y ZUlQQzo6QXV0b21hdGljUmVwbHk7CisKKyAgICBQbHVnaW5Db250cm9sbGVyOjpQbHVnaW5EZXN0 cnVjdGlvblByb3RlY3RvciBwcm90ZWN0b3IocGx1Z2luQ29udHJvbGxlclByb3h5LT5hc1BsdWdp bkNvbnRyb2xsZXIoKSk7CisgICAgQ29yZUlQQzo6U3luY1JlcGx5TW9kZSByZXBseU1vZGUgPSBw bHVnaW5Db250cm9sbGVyUHJveHktPmRpZFJlY2VpdmVTeW5jUGx1Z2luQ29udHJvbGxlclByb3h5 TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cywgcmVwbHkpOwogCi0gICAg cmV0dXJuIENvcmVJUEM6OkF1dG9tYXRpY1JlcGx5OworICAgIHJldHVybiByZXBseU1vZGU7CiB9 CiAKIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZENsb3NlKENvcmVJUEM6OkNvbm5lY3Rp b24qKQpJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVj dGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24uaAkocmV2aXNpb24gNzg5MTApCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDE0 ICs0NSwxNCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+V2ViUHJvY2Vzc0Nvbm5lY3Rpb24oKTsK IAogICAgIENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24oKSBjb25zdCB7IHJldHVybiBt X2Nvbm5lY3Rpb24uZ2V0KCk7IH0KLQogICAgIE5QUmVtb3RlT2JqZWN0TWFwKiBucFJlbW90ZU9i amVjdE1hcCgpIGNvbnN0IHsgcmV0dXJuIG1fbnBSZW1vdGVPYmplY3RNYXAuZ2V0KCk7IH0KIAor ICAgIHZvaWQgcmVtb3ZlUGx1Z2luQ29udHJvbGxlclByb3h5KFBsdWdpbkNvbnRyb2xsZXJQcm94 eSopOworCiBwcml2YXRlOgogICAgIFdlYlByb2Nlc3NDb25uZWN0aW9uKENvcmVJUEM6OkNvbm5l Y3Rpb246OklkZW50aWZpZXIpOwogCiAgICAgdm9pZCBhZGRQbHVnaW5Db250cm9sbGVyUHJveHko UGFzc093blB0cjxQbHVnaW5Db250cm9sbGVyUHJveHk+KTsKLSAgICB2b2lkIHJlbW92ZVBsdWdp bkNvbnRyb2xsZXJQcm94eShQbHVnaW5Db250cm9sbGVyUHJveHkqKTsKIAogICAgIHZvaWQgZGVz dHJveVBsdWdpbkNvbnRyb2xsZXJQcm94eShQbHVnaW5Db250cm9sbGVyUHJveHkqKTsKIApJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xsZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29u dHJvbGxlci5oCShyZXZpc2lvbiA3ODkxMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5Db250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwOCw2ICsxMDgs MzAgQEAgcHVibGljOgogICAgIC8vIFJldHVybnMgd2hldGhlciBwcml2YXRlIGJyb3dzaW5nIGlz IGVuYWJsZWQuCiAgICAgdmlydHVhbCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpID0g MDsKIAorICAgIC8vIEluY3JlbWVudHMgYSBjb3VudGVyIHRoYXQgcHJldmVudHMgdGhlIHBsdWct aW4gZnJvbSBiZWluZyBkZXN0cm95ZWQuCisgICAgdmlydHVhbCB2b2lkIHByb3RlY3RQbHVnaW5G cm9tRGVzdHJ1Y3Rpb24oKSA9IDA7CisKKyAgICAvLyBEZWNyZW1lbnRzIGEgY291bnRlciB0aGF0 LCB3aGVuIGl0IHJlYWNoZXMgMCwgc3RvcHMgcHJldmVudGluZyB0aGUgcGx1Zy1pbiBmcm9tIGJl aW5nIGRlc3Ryb3llZC4KKyAgICB2aXJ0dWFsIHZvaWQgdW5wcm90ZWN0UGx1Z2luRnJvbURlc3Ry dWN0aW9uKCkgPSAwOworCisgICAgLy8gSGVscGVyIGNsYXNzIGZvciBkZWxheWluZyBkZXN0cnVj dGlvbiBvZiBhIHBsdWctaW4uCisgICAgY2xhc3MgUGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3Ig eworICAgIHB1YmxpYzoKKyAgICAgICAgZXhwbGljaXQgUGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0 b3IoUGx1Z2luQ29udHJvbGxlciogcGx1Z2luQ29udHJvbGxlcikKKyAgICAgICAgICAgIDogbV9w bHVnaW5Db250cm9sbGVyKHBsdWdpbkNvbnRyb2xsZXIpCisgICAgICAgIHsKKyAgICAgICAgICAg IG1fcGx1Z2luQ29udHJvbGxlci0+cHJvdGVjdFBsdWdpbkZyb21EZXN0cnVjdGlvbigpOworICAg ICAgICB9CisgICAgICAgIAorICAgICAgICB+UGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3IoKQor ICAgICAgICB7CisgICAgICAgICAgICBtX3BsdWdpbkNvbnRyb2xsZXItPnVucHJvdGVjdFBsdWdp bkZyb21EZXN0cnVjdGlvbigpOworICAgICAgICB9CisgICAgICAgIAorICAgIHByaXZhdGU6Cisg ICAgICAgIFBsdWdpbkNvbnRyb2xsZXIqIG1fcGx1Z2luQ29udHJvbGxlcjsKKyAgICB9OworICAg IAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgflBsdWdpbkNvbnRyb2xsZXIoKSB7IH0KIH07Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94 eS5jcHAJKHJldmlzaW9uIDc4OTEwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk0LDYgKzM5NCw4IEBAIHZv aWQgUGx1Z2luUHJveHk6OmdldFBsdWdpbkVsZW1lbnROUE9iamUKIAogdm9pZCBQbHVnaW5Qcm94 eTo6ZXZhbHVhdGUoY29uc3QgTlBWYXJpYW50RGF0YSYgbnBPYmplY3RBc1ZhcmlhbnREYXRhLCBj b25zdCBTdHJpbmcmIHNjcmlwdFN0cmluZywgYm9vbCBhbGxvd1BvcHVwcywgYm9vbCYgcmV0dXJu VmFsdWUsIE5QVmFyaWFudERhdGEmIHJlc3VsdERhdGEpCiB7CisgICAgUGx1Z2luQ29udHJvbGxl cjo6UGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKG1fcGx1Z2luQ29udHJvbGxl cik7CisKICAgICBOUFZhcmlhbnQgbnBPYmplY3RBc1ZhcmlhbnQgPSBtX2Nvbm5lY3Rpb24tPm5w UmVtb3RlT2JqZWN0TWFwKCktPm5wVmFyaWFudERhdGFUb05QVmFyaWFudChucE9iamVjdEFzVmFy aWFudERhdGEpOwogICAgIEFTU0VSVChOUFZBUklBTlRfSVNfT0JKRUNUKG5wT2JqZWN0QXNWYXJp YW50KSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDc4OTEwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDA3LDYgKzEw MDcsMTggQEAgYm9vbCBQbHVnaW5WaWV3Ojppc1ByaXZhdGVCcm93c2luZ0VuYWJsZQogICAgIHJl dHVybiBzZXR0aW5ncy0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOwogfQogCit2b2lkIFBsdWdp blZpZXc6OnByb3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rpb24oKQoreworICAgIGlmICghbV9pc0Jl aW5nRGVzdHJveWVkKQorICAgICAgICByZWYoKTsKK30KKwordm9pZCBQbHVnaW5WaWV3Ojp1bnBy b3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rpb24oKQoreworICAgIGlmICghbV9pc0JlaW5nRGVzdHJv eWVkKQorICAgICAgICBkZXJlZigpOworfQorCiB2b2lkIFBsdWdpblZpZXc6OmRpZEZpbmlzaExv YWQoV2ViRnJhbWUqIHdlYkZyYW1lKQogewogICAgIFJlZlB0cjxVUkxSZXF1ZXN0PiByZXF1ZXN0 ID0gbV9wZW5kaW5nRnJhbWVMb2Fkcy50YWtlKHdlYkZyYW1lKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAkocmV2aXNpb24gNzg5MTAp CisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzgsNiArMTM4LDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIFN0cmlu ZyBjb29raWVzRm9yVVJMKGNvbnN0IFN0cmluZyYpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRDb29r aWVzRm9yVVJMKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0 cmluZyk7CiAgICAgdmlydHVhbCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOworICAg IHZpcnR1YWwgdm9pZCBwcm90ZWN0UGx1Z2luRnJvbURlc3RydWN0aW9uKCk7CisgICAgdmlydHVh bCB2b2lkIHVucHJvdGVjdFBsdWdpbkZyb21EZXN0cnVjdGlvbigpOwogCiAgICAgLy8gV2ViRnJh bWU6OkxvYWRMaXN0ZW5lcgogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkKFdlYkZyYW1l Kik7Cg==