154208 2016-02-12 18:52:36 -0800 [JSC] ZeroExtend and SignExtend use incorrect addressing on ARM64 2016-02-12 20:48:44 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1164462 0 benjamin 2016-02-12 18:52:36 -0800 [JSC] ZeroExtend and SignExtend use incorrect addressing on ARM64 1164463 1 271258 benjamin 2016-02-12 18:59:33 -0800 Created attachment 271258 Patch 1164475 2 271264 benjamin 2016-02-12 19:51:39 -0800 Created attachment 271264 Patch for landing 1164481 3 271264 commit-queue 2016-02-12 20:48:41 -0800 Comment on attachment 271264 Patch for landing Clearing flags on attachment: 271264 Committed r196544: <http://trac.webkit.org/changeset/196544> 1164482 4 commit-queue 2016-02-12 20:48:44 -0800 All reviewed patches have been landed. Closing bug. 271258 2016-02-12 18:59:33 -0800 2016-02-12 19:51:37 -0800 Patch bug-154208-20160212185912.patch text/plain 11380 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NjQ1OWYwMWU1NzEyZDYyNmM3NGNmYjJhNTk1ZTUyNzdkYjdiZDk0Li4zNGRlZTQyZWI4YmQwYzE3 YTk4YTZmMjk5ZmUxYTU0MjFmNGU5NWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MCBAQAorMjAxNi0wMi0xMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxl LmNvbT4KKworICAgICAgICBbSlNDXSBaZXJvRXh0ZW5kIGFuZCBTaWduRXh0ZW5kIHVzZSBpbmNv cnJlY3QgYWRkcmVzc2luZyBvbiBBUk02NAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MjA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2hlbiBsb3dlcmluZzoKKyAgICAgICAgICAgIEAxID0gTG9hZDMy KEB4KQorICAgICAgICAgICAgQDIgPSBTRXh0OChAMSkKKworICAgICAgICBMb3dlclRvQWlyIHdv dWxkIHNlZSB0aGVyZSBpcyBhIGZvcm0gb2YgWmVyb0V4dGVuZDhUbzMyIChhbiBhbGlhcyBmb3Ig TG9hZDgpCisgICAgICAgIGFuZCB1c2UgdGhhdC4KKworICAgICAgICBUaGVyZSBhcmUgdHdvIHBy b2JsZW1zIHdpdGggdGhhdDoKKyAgICAgICAgMSkgSWYgd2UgaGF2ZSBhbiBBZGRyLCBpdCB3ZW50 IHRocm91Z2ggbGVnYWxpemVNZW1vcnlPZmZzZXRzKCkgZm9yIGEgMzJiaXRzCisgICAgICAgICAg IGxvYWQuIElmIHVzZWQgb24gYW4gb3RoZXIga2luZCBvZiBsb2FkLCB0aGVyZSBpcyBubyBndWFy YW50ZWUgdGhlIGFkZHJlc3NpbmcKKyAgICAgICAgICAgaXMgc3RpbGwgdmFsaWQuCisgICAgICAg IDIpIElmIHdlIGhhdmUgYW4gSW5kZXgsIGl0IGlzIGNvbXB1dGVkIGZvciB0aGUgMzJiaXRzIE1l bW9yeVZhbHVlLgorICAgICAgICAgICBUaGUgY29tcHV0ZWQgaW5kZXggaXMgbm90IHZhbGlkIGZv ciB0aGUgOGJpdHMgbG9hZC4KKworICAgICAgICAoMikgY291bGQgYmUgZml4ZWQgYnkgY2hhbmdp bmcgTG93ZXJUb0FpciB0byB1c2UgdGhlIGN1cnJlbnQgaW5zdHJ1Y3Rpb24gd2lkdGgKKyAgICAg ICAgaW5zdGVhZCBvZiB0aGUgQjNWYWx1ZVdpZHRoIGJ1dCB0aGF0J3MgYSBiaXQgdHJpY2t5LiBX ZSBzaG91bGQganVzdCBlbWJyYWNlCisgICAgICAgIHRoYXQgb25lIG9mIG91ciB0YXJnZXQgaXMg YSBMb2FkLVN0b3JlIGFyY2hpdGVjdHVyZS4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCBJIGp1 c3QgZGlzYWJsZWQgdGhlIGZhdWx0eSBmb3JtcyBvbiBBUk02NC4gV2Ugc3RpbGwgbmVlZCB0aG9z ZSBvcGVyYXRpb25zCisgICAgICAgIHRvIGJlIGZhc3QsIHRoaXMgd2lsbCBiZSBhZGRyZXNzZWQg aW46IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQyMDcKKworICAg ICAgICBJIGFsc28gc3RyZW5ndGhlbmVkIHRoZSBtX2FsbG93U2NyYXRjaFJlZ2lzdGVyIGFzc2Vy dGlvbi4gVGhlIGluc3RydWN0aW9ucyB0aGF0IGRvIG5vdAorICAgICAgICBpbnZhbGlkYXRlIHRo ZSB0ZW1wb3JhcnkgZGlkIG5vdCBydW4gdGhlIGFzc2VydGlvbiwgbWFraW5nIHRoaXMgaGFyZGVy IHRvIGRlYnVnLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaDoK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6bG9hZDgpOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlckFSTTY0OjpzdG9yZTY0KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJBUk02NDo6c3RvcmUzMik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6 OmxvYWREb3VibGUpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0OjpzdG9yZURv dWJsZSk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmJyYW5jaDMyKToKKyAg ICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6YnJhbmNoNjQpOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlckFSTTY0OjpnZXRDYWNoZWREYXRhVGVtcFJlZ2lzdGVySURBbmRJbnZh bGlkYXRlKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6Z2V0Q2FjaGVkTWVt b3J5VGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJBUk02NDo6ZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik6CisgICAgICAgIChKU0M6Ok1hY3Jv QXNzZW1ibGVyQVJNNjQ6OmNhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlcik6CisgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmxvYWQpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTTY0OjpzdG9yZSk6CisgICAgICAgICogYjMvYWlyL0Fpck9wY29kZS5vcGNvZGVzOgorCiAy MDE2LTAyLTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fu bm90IGNhbGwgaW5pdGlhbGl6ZUluZGV4KCkgaWYgd2UgZGlkbid0IGNyZWF0ZSB0aGUgYXJyYXkg dXNpbmcgdHJ5Q3JlYXRlVW5pbml0aWFsaXplZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oCmluZGV4IDY5Y2IxM2U0NjJh YWRmMjhjNzBhMzNlZmNmOWEwZTJjMDFhYWMwOGEuLmQyYjkwZjllNzYyYmE5YzU1NzRjMmYwZTI0 ODU2NzI4OGZmNWNiOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oCkBAIC0xMDQ0LDEwICsxMDQ0LDEwIEBAIHB1Ymxp YzoKICAgICAKICAgICB2b2lkIGxvYWQ4KGNvbnN0IHZvaWQqIGFkZHJlc3MsIFJlZ2lzdGVySUQg ZGVzdCkKICAgICB7Ci0gICAgICAgIG1vdmVUb0NhY2hlZFJlZyhUcnVzdGVkSW1tUHRyKGFkZHJl c3MpLCBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgIG1vdmVUb0NhY2hlZFJl ZyhUcnVzdGVkSW1tUHRyKGFkZHJlc3MpLCBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAg ICAgICAgIG1fYXNzZW1ibGVyLmxkcmIoZGVzdCwgbWVtb3J5VGVtcFJlZ2lzdGVyLCBBUk02NFJl Z2lzdGVyczo6enIpOwogICAgICAgICBpZiAoZGVzdCA9PSBtZW1vcnlUZW1wUmVnaXN0ZXIpCi0g ICAgICAgICAgICBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlci5pbnZhbGlkYXRlKCk7CisgICAg ICAgICAgICBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CiAgICAgfQog CiAgICAgdm9pZCBsb2FkOFNpZ25lZEV4dGVuZFRvMzIoSW1wbGljaXRBZGRyZXNzIGFkZHJlc3Ms IFJlZ2lzdGVySUQgZGVzdCkKQEAgLTExMTksNyArMTExOSw3IEBAIHB1YmxpYzoKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIG1vdmVUb0NhY2hlZFJlZyhpbW0sIG1f ZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgIG1vdmVUb0NhY2hlZFJlZyhpbW0sIGRh dGFNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgIHN0b3JlNjQoZGF0YVRlbXBSZWdpc3Rl ciwgYWRkcmVzcyk7CiAgICAgfQogCkBAIC0xMTMwLDcgKzExMzAsNyBAQCBwdWJsaWM6CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoaW1t LCBtX2RhdGFNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoaW1t LCBkYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBzdG9yZTY0KGRhdGFUZW1wUmVn aXN0ZXIsIGFkZHJlc3MpOwogICAgIH0KICAgICAKQEAgLTExNzUsNyArMTE3NSw3IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIG1vdmVUb0NhY2hl ZFJlZyhpbW0sIG1fZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgIG1vdmVUb0NhY2hl ZFJlZyhpbW0sIGRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgIHN0b3JlMzIoZGF0 YVRlbXBSZWdpc3RlciwgYWRkcmVzcyk7CiAgICAgfQogCkBAIC0xMTg2LDcgKzExODYsNyBAQCBw dWJsaWM6CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBtb3ZlVG9D YWNoZWRSZWcoaW1tLCBtX2RhdGFNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9D YWNoZWRSZWcoaW1tLCBkYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBzdG9yZTMy KGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3MpOwogICAgIH0KIApAQCAtMTE5Nyw3ICsxMTk3LDcg QEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgbW92 ZVRvQ2FjaGVkUmVnKGltbSwgbV9kYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgbW92 ZVRvQ2FjaGVkUmVnKGltbSwgZGF0YU1lbW9yeVRlbXBSZWdpc3RlcigpKTsKICAgICAgICAgc3Rv cmUzMihkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzKTsKICAgICB9CiAKQEAgLTE0OTIsNyArMTQ5 Miw3IEBAIHB1YmxpYzoKICAgICAKICAgICB2b2lkIGxvYWREb3VibGUoVHJ1c3RlZEltbVB0ciBh ZGRyZXNzLCBGUFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIG1vdmVUb0NhY2hlZFJl ZyhhZGRyZXNzLCBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgIG1vdmVUb0Nh Y2hlZFJlZyhhZGRyZXNzLCBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgIG1f YXNzZW1ibGVyLmxkcjw2ND4oZGVzdCwgbWVtb3J5VGVtcFJlZ2lzdGVyLCBBUk02NFJlZ2lzdGVy czo6enIpOwogICAgIH0KIApAQCAtMTYzNyw3ICsxNjM3LDcgQEAgcHVibGljOgogCiAgICAgdm9p ZCBzdG9yZURvdWJsZShGUFJlZ2lzdGVySUQgc3JjLCBUcnVzdGVkSW1tUHRyIGFkZHJlc3MpCiAg ICAgewotICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoYWRkcmVzcywgbV9jYWNoZWRNZW1vcnlUZW1w UmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoYWRkcmVzcywgY2FjaGVkTWVtb3J5 VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBtX2Fzc2VtYmxlci5zdHI8NjQ+KHNyYywgbWVtb3J5 VGVtcFJlZ2lzdGVyLCBBUk02NFJlZ2lzdGVyczo6enIpOwogICAgIH0KIApAQCAtMTg5NSw3ICsx ODk1LDcgQEAgcHVibGljOgogICAgICAgICBlbHNlIGlmIChpc1VJbnQxMigtcmlnaHQubV92YWx1 ZSkpCiAgICAgICAgICAgICBtX2Fzc2VtYmxlci5jbW48MzI+KGxlZnQsIFVJbnQxMigtcmlnaHQu bV92YWx1ZSkpOwogICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIG1vdmVUb0NhY2hlZFJlZyhy aWdodCwgbV9kYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1vdmVUb0NhY2hl ZFJlZyhyaWdodCwgZGF0YU1lbW9yeVRlbXBSZWdpc3RlcigpKTsKICAgICAgICAgICAgIG1fYXNz ZW1ibGVyLmNtcDwzMj4obGVmdCwgZGF0YVRlbXBSZWdpc3Rlcik7CiAgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIEp1bXAobWFrZUJyYW5jaChjb25kKSk7CkBAIC0xOTYxLDcgKzE5NjEsNyBAQCBw dWJsaWM6CiAgICAgICAgIGVsc2UgaWYgKGlzVUludDEyKC1pbW1lZGlhdGUpKQogICAgICAgICAg ICAgbV9hc3NlbWJsZXIuY21uPDY0PihsZWZ0LCBVSW50MTIoc3RhdGljX2Nhc3Q8aW50MzJfdD4o LWltbWVkaWF0ZSkpKTsKICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBtb3ZlVG9DYWNoZWRS ZWcocmlnaHQsIG1fZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgICAgICBtb3ZlVG9D YWNoZWRSZWcocmlnaHQsIGRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgICAgICBt X2Fzc2VtYmxlci5jbXA8NjQ+KGxlZnQsIGRhdGFUZW1wUmVnaXN0ZXIpOwogICAgICAgICB9CiAg ICAgICAgIHJldHVybiBKdW1wKG1ha2VCcmFuY2goY29uZCkpOwpAQCAtMjg3MiwxMiArMjg3Miwy MiBAQCBwcml2YXRlOgogICAgIEFMV0FZU19JTkxJTkUgUmVnaXN0ZXJJRCBnZXRDYWNoZWREYXRh VGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCkKICAgICB7CiAgICAgICAgIFJFTEVBU0VfQVNT RVJUKG1fYWxsb3dTY3JhdGNoUmVnaXN0ZXIpOwotICAgICAgICByZXR1cm4gbV9kYXRhTWVtb3J5 VGVtcFJlZ2lzdGVyLnJlZ2lzdGVySURJbnZhbGlkYXRlKCk7CisgICAgICAgIHJldHVybiBkYXRh TWVtb3J5VGVtcFJlZ2lzdGVyKCkucmVnaXN0ZXJJREludmFsaWRhdGUoKTsKICAgICB9CiAgICAg QUxXQVlTX0lOTElORSBSZWdpc3RlcklEIGdldENhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcklEQW5k SW52YWxpZGF0ZSgpCiAgICAgewogICAgICAgICBSRUxFQVNFX0FTU0VSVChtX2FsbG93U2NyYXRj aFJlZ2lzdGVyKTsKLSAgICAgICAgcmV0dXJuIG1fY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyLnJl Z2lzdGVySURJbnZhbGlkYXRlKCk7CisgICAgICAgIHJldHVybiBjYWNoZWRNZW1vcnlUZW1wUmVn aXN0ZXIoKS5yZWdpc3RlcklESW52YWxpZGF0ZSgpOworICAgIH0KKyAgICBBTFdBWVNfSU5MSU5F IENhY2hlZFRlbXBSZWdpc3RlciYgZGF0YU1lbW9yeVRlbXBSZWdpc3RlcigpCisgICAgeworICAg ICAgICBSRUxFQVNFX0FTU0VSVChtX2FsbG93U2NyYXRjaFJlZ2lzdGVyKTsKKyAgICAgICAgcmV0 dXJuIG1fZGF0YU1lbW9yeVRlbXBSZWdpc3RlcjsKKyAgICB9CisgICAgQUxXQVlTX0lOTElORSBD YWNoZWRUZW1wUmVnaXN0ZXImIGNhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcigpCisgICAgeworICAg ICAgICBSRUxFQVNFX0FTU0VSVChtX2FsbG93U2NyYXRjaFJlZ2lzdGVyKTsKKyAgICAgICAgcmV0 dXJuIG1fY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyOwogICAgIH0KIAogICAgIEFMV0FZU19JTkxJ TkUgYm9vbCBpc0luSW50UmFuZ2UoaW50cHRyX3QgdmFsdWUpCkBAIC0zMDEwLDEyICszMDIwLDEy IEBAIHByaXZhdGU6CiAgICAgQUxXQVlTX0lOTElORSB2b2lkIGxvYWQoY29uc3Qgdm9pZCogYWRk cmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgaW50cHRyX3QgY3VycmVudFJl Z2lzdGVyQ29udGVudHM7Ci0gICAgICAgIGlmIChtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlci52 YWx1ZShjdXJyZW50UmVnaXN0ZXJDb250ZW50cykpIHsKKyAgICAgICAgaWYgKGNhY2hlZE1lbW9y eVRlbXBSZWdpc3RlcigpLnZhbHVlKGN1cnJlbnRSZWdpc3RlckNvbnRlbnRzKSkgewogICAgICAg ICAgICAgaW50cHRyX3QgYWRkcmVzc0FzSW50ID0gcmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4o YWRkcmVzcyk7CiAgICAgICAgICAgICBpbnRwdHJfdCBhZGRyZXNzRGVsdGEgPSBhZGRyZXNzQXNJ bnQgLSBjdXJyZW50UmVnaXN0ZXJDb250ZW50czsKIAogICAgICAgICAgICAgaWYgKGRlc3QgPT0g bWVtb3J5VGVtcFJlZ2lzdGVyKQotICAgICAgICAgICAgICAgIG1fY2FjaGVkTWVtb3J5VGVtcFJl Z2lzdGVyLmludmFsaWRhdGUoKTsKKyAgICAgICAgICAgICAgICBjYWNoZWRNZW1vcnlUZW1wUmVn aXN0ZXIoKS5pbnZhbGlkYXRlKCk7CiAKICAgICAgICAgICAgIGlmIChpc0luSW50UmFuZ2UoYWRk cmVzc0RlbHRhKSkgewogICAgICAgICAgICAgICAgIGlmIChBUk02NEFzc2VtYmxlcjo6Y2FuRW5j b2RlU0ltbU9mZnNldChhZGRyZXNzRGVsdGEpKSB7CkBAIC0zMDMxLDcgKzMwNDEsNyBAQCBwcml2 YXRlOgogCiAgICAgICAgICAgICBpZiAoKGFkZHJlc3NBc0ludCAmICh+bWFza0hhbGZXb3JkMCkp ID09IChjdXJyZW50UmVnaXN0ZXJDb250ZW50cyAmICh+bWFza0hhbGZXb3JkMCkpKSB7CiAgICAg ICAgICAgICAgICAgbV9hc3NlbWJsZXIubW92azw2ND4obWVtb3J5VGVtcFJlZ2lzdGVyLCBhZGRy ZXNzQXNJbnQgJiBtYXNrSGFsZldvcmQwLCAwKTsKLSAgICAgICAgICAgICAgICBtX2NhY2hlZE1l bW9yeVRlbXBSZWdpc3Rlci5zZXRWYWx1ZShyZWludGVycHJldF9jYXN0PGludHB0cl90PihhZGRy ZXNzKSk7CisgICAgICAgICAgICAgICAgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkuc2V0VmFs dWUocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oYWRkcmVzcykpOwogICAgICAgICAgICAgICAg IG1fYXNzZW1ibGVyLmxkcjxkYXRhc2l6ZT4oZGVzdCwgbWVtb3J5VGVtcFJlZ2lzdGVyLCBBUk02 NFJlZ2lzdGVyczo6enIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0K QEAgLTMwMzksOSArMzA0OSw5IEBAIHByaXZhdGU6CiAKICAgICAgICAgbW92ZShUcnVzdGVkSW1t UHRyKGFkZHJlc3MpLCBtZW1vcnlUZW1wUmVnaXN0ZXIpOwogICAgICAgICBpZiAoZGVzdCA9PSBt ZW1vcnlUZW1wUmVnaXN0ZXIpCi0gICAgICAgICAgICBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rl ci5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKS5p bnZhbGlkYXRlKCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fY2FjaGVkTWVtb3J5VGVt cFJlZ2lzdGVyLnNldFZhbHVlKHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGFkZHJlc3MpKTsK KyAgICAgICAgICAgIGNhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcigpLnNldFZhbHVlKHJlaW50ZXJw cmV0X2Nhc3Q8aW50cHRyX3Q+KGFkZHJlc3MpKTsKICAgICAgICAgbV9hc3NlbWJsZXIubGRyPGRh dGFzaXplPihkZXN0LCBtZW1vcnlUZW1wUmVnaXN0ZXIsIEFSTTY0UmVnaXN0ZXJzOjp6cik7CiAg ICAgfQogCkBAIC0zMDUwLDcgKzMwNjAsNyBAQCBwcml2YXRlOgogICAgIHsKICAgICAgICAgQVNT RVJUKHNyYyAhPSBtZW1vcnlUZW1wUmVnaXN0ZXIpOwogICAgICAgICBpbnRwdHJfdCBjdXJyZW50 UmVnaXN0ZXJDb250ZW50czsKLSAgICAgICAgaWYgKG1fY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVy LnZhbHVlKGN1cnJlbnRSZWdpc3RlckNvbnRlbnRzKSkgeworICAgICAgICBpZiAoY2FjaGVkTWVt b3J5VGVtcFJlZ2lzdGVyKCkudmFsdWUoY3VycmVudFJlZ2lzdGVyQ29udGVudHMpKSB7CiAgICAg ICAgICAgICBpbnRwdHJfdCBhZGRyZXNzQXNJbnQgPSByZWludGVycHJldF9jYXN0PGludHB0cl90 PihhZGRyZXNzKTsKICAgICAgICAgICAgIGludHB0cl90IGFkZHJlc3NEZWx0YSA9IGFkZHJlc3NB c0ludCAtIGN1cnJlbnRSZWdpc3RlckNvbnRlbnRzOwogCkBAIC0zMDY4LDE0ICszMDc4LDE0IEBA IHByaXZhdGU6CiAKICAgICAgICAgICAgIGlmICgoYWRkcmVzc0FzSW50ICYgKH5tYXNrSGFsZldv cmQwKSkgPT0gKGN1cnJlbnRSZWdpc3RlckNvbnRlbnRzICYgKH5tYXNrSGFsZldvcmQwKSkpIHsK ICAgICAgICAgICAgICAgICBtX2Fzc2VtYmxlci5tb3ZrPDY0PihtZW1vcnlUZW1wUmVnaXN0ZXIs IGFkZHJlc3NBc0ludCAmIG1hc2tIYWxmV29yZDAsIDApOwotICAgICAgICAgICAgICAgIG1fY2Fj aGVkTWVtb3J5VGVtcFJlZ2lzdGVyLnNldFZhbHVlKHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+ KGFkZHJlc3MpKTsKKyAgICAgICAgICAgICAgICBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKS5z ZXRWYWx1ZShyZWludGVycHJldF9jYXN0PGludHB0cl90PihhZGRyZXNzKSk7CiAgICAgICAgICAg ICAgICAgbV9hc3NlbWJsZXIuc3RyPGRhdGFzaXplPihzcmMsIG1lbW9yeVRlbXBSZWdpc3Rlciwg QVJNNjRSZWdpc3RlcnM6OnpyKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAogICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoYWRkcmVzcyksIG1l bW9yeVRlbXBSZWdpc3Rlcik7Ci0gICAgICAgIG1fY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyLnNl dFZhbHVlKHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGFkZHJlc3MpKTsKKyAgICAgICAgY2Fj aGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkuc2V0VmFsdWUocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJf dD4oYWRkcmVzcykpOwogICAgICAgICBtX2Fzc2VtYmxlci5zdHI8ZGF0YXNpemU+KHNyYywgbWVt b3J5VGVtcFJlZ2lzdGVyLCBBUk02NFJlZ2lzdGVyczo6enIpOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJPcGNvZGUub3Bjb2RlcyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyT3Bjb2RlLm9wY29kZXMKaW5kZXggNGVkNDhmMjIx MWQ1YjVkMDdlMmRkOGIyMGEwY2Y0M2ViOGM2MTg5Zi4uMjdlYzliNjVlOWI5YmQwYzljZWU3ZTE4 ZjIxOTVlNTRlYTZhNzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fp ci9BaXJPcGNvZGUub3Bjb2RlcworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fp ck9wY29kZS5vcGNvZGVzCkBAIC00NTgsMjMgKzQ1OCwyMyBAQCBTaWduRXh0ZW5kMzJUb1B0ciBV Okc6MzIsIEQ6RzpQdHIKIAogWmVyb0V4dGVuZDhUbzMyIFU6Rzo4LCBaRDpHOjMyCiAgICAgVG1w LCBUbXAKLSAgICBBZGRyLCBUbXAgYXMgbG9hZDgKLSAgICBJbmRleCwgVG1wIGFzIGxvYWQ4Cisg ICAgeDg2OiBBZGRyLCBUbXAgYXMgbG9hZDgKKyAgICB4ODY6IEluZGV4LCBUbXAgYXMgbG9hZDgK IAogU2lnbkV4dGVuZDhUbzMyIFU6Rzo4LCBaRDpHOjMyCiAgICAgVG1wLCBUbXAKLSAgICBBZGRy LCBUbXAgYXMgbG9hZDhTaWduZWRFeHRlbmRUbzMyCi0gICAgSW5kZXgsIFRtcCBhcyBsb2FkOFNp Z25lZEV4dGVuZFRvMzIKKyAgICB4ODY6IEFkZHIsIFRtcCBhcyBsb2FkOFNpZ25lZEV4dGVuZFRv MzIKKyAgICB4ODY6IEluZGV4LCBUbXAgYXMgbG9hZDhTaWduZWRFeHRlbmRUbzMyCiAKIFplcm9F eHRlbmQxNlRvMzIgVTpHOjE2LCBaRDpHOjMyCiAgICAgVG1wLCBUbXAKLSAgICBBZGRyLCBUbXAg YXMgbG9hZDE2Ci0gICAgSW5kZXgsIFRtcCBhcyBsb2FkMTYKKyAgICB4ODY6IEFkZHIsIFRtcCBh cyBsb2FkMTYKKyAgICB4ODY6IEluZGV4LCBUbXAgYXMgbG9hZDE2CiAKIFNpZ25FeHRlbmQxNlRv MzIgVTpHOjE2LCBaRDpHOjMyCiAgICAgVG1wLCBUbXAKLSAgICBBZGRyLCBUbXAgYXMgbG9hZDE2 U2lnbmVkRXh0ZW5kVG8zMgotICAgIEluZGV4LCBUbXAgYXMgbG9hZDE2U2lnbmVkRXh0ZW5kVG8z MgorICAgIHg4NjogQWRkciwgVG1wIGFzIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIKKyAgICB4ODY6 IEluZGV4LCBUbXAgYXMgbG9hZDE2U2lnbmVkRXh0ZW5kVG8zMgogCiBNb3ZlRmxvYXQgVTpGOjMy LCBEOkY6MzIKICAgICBUbXAsIFRtcCBhcyBtb3ZlRG91YmxlCg== 271264 2016-02-12 19:51:39 -0800 2016-02-12 20:48:41 -0800 Patch for landing bug-154208-20160212195118.patch text/plain 11378 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MDFiMjdiZjJkNjg5NjJkODczMmVmNzA4MjYyZTViZDI1MGVhYWM0Li41NGExYTJlZWM0NzEyMWMy YWIzYzhlMjVhMjA3NWE2M2E0Zjc1MWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MCBAQAorMjAxNi0wMi0xMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxl LmNvbT4KKworICAgICAgICBbSlNDXSBaZXJvRXh0ZW5kIGFuZCBTaWduRXh0ZW5kIHVzZSBpbmNv cnJlY3QgYWRkcmVzc2luZyBvbiBBUk02NAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MjA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRmlsaXAgUGl6 bG8uCisKKyAgICAgICAgV2hlbiBsb3dlcmluZzoKKyAgICAgICAgICAgIEAxID0gTG9hZDMyKEB4 KQorICAgICAgICAgICAgQDIgPSBTRXh0OChAMSkKKworICAgICAgICBMb3dlclRvQWlyIHdvdWxk IHNlZSB0aGVyZSBpcyBhIGZvcm0gb2YgU2lnbkV4dGVuZDhUbzMyIChhbiBhbGlhcyBmb3IgTG9h ZDhTKQorICAgICAgICBhbmQgdXNlIHRoYXQuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBwcm9i bGVtcyB3aXRoIHRoYXQ6CisgICAgICAgIDEpIElmIHdlIGhhdmUgYW4gQWRkciwgaXQgd2VudCB0 aHJvdWdoIGxlZ2FsaXplTWVtb3J5T2Zmc2V0cygpIGZvciBhIDMyYml0cworICAgICAgICAgICBs b2FkLiBJZiB1c2VkIG9uIGFuIG90aGVyIGtpbmQgb2YgbG9hZCwgdGhlcmUgaXMgbm8gZ3VhcmFu dGVlIHRoZSBhZGRyZXNzaW5nCisgICAgICAgICAgIGlzIHN0aWxsIHZhbGlkLgorICAgICAgICAy KSBJZiB3ZSBoYXZlIGFuIEluZGV4LCBpdCBpcyBjb21wdXRlZCBmb3IgdGhlIDMyYml0cyBNZW1v cnlWYWx1ZS4KKyAgICAgICAgICAgVGhlIGNvbXB1dGVkIGluZGV4IGlzIG5vdCB2YWxpZCBmb3Ig dGhlIDhiaXRzIGxvYWQuCisKKyAgICAgICAgKDIpIGNvdWxkIGJlIGZpeGVkIGJ5IGNoYW5naW5n IExvd2VyVG9BaXIgdG8gdXNlIHRoZSBjdXJyZW50IGluc3RydWN0aW9uIHdpZHRoCisgICAgICAg IGluc3RlYWQgb2YgdGhlIEIzVmFsdWVXaWR0aCBidXQgdGhhdCdzIGEgYml0IHRyaWNreS4gV2Ug c2hvdWxkIGp1c3QgZW1icmFjZQorICAgICAgICB0aGF0IG9uZSBvZiBvdXIgdGFyZ2V0IGlzIGEg TG9hZC1TdG9yZSBhcmNoaXRlY3R1cmUuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgSSBqdXN0 IGRpc2FibGVkIHRoZSBmYXVsdHkgZm9ybXMgb24gQVJNNjQuIFdlIHN0aWxsIG5lZWQgdGhvc2Ug b3BlcmF0aW9ucworICAgICAgICB0byBiZSBmYXN0LCB0aGlzIHdpbGwgYmUgYWRkcmVzc2VkIGlu OiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MjA3CisKKyAgICAg ICAgSSBhbHNvIHN0cmVuZ3RoZW5lZCB0aGUgbV9hbGxvd1NjcmF0Y2hSZWdpc3RlciBhc3NlcnRp b24uIFRoZSBpbnN0cnVjdGlvbnMgdGhhdCBkbyBub3QKKyAgICAgICAgaW52YWxpZGF0ZSB0aGUg dGVtcG9yYXJ5IGRpZCBub3QgcnVuIHRoZSBhc3NlcnRpb24sIG1ha2luZyB0aGlzIGhhcmRlciB0 byBkZWJ1Zy4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0Lmg6Cisg ICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmxvYWQ4KToKKyAgICAgICAgKEpTQzo6 TWFjcm9Bc3NlbWJsZXJBUk02NDo6c3RvcmU2NCk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyQVJNNjQ6OnN0b3JlMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0Ojps b2FkRG91YmxlKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6c3RvcmVEb3Vi bGUpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0OjpicmFuY2gzMik6CisgICAg ICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmJyYW5jaDY0KToKKyAgICAgICAgKEpTQzo6 TWFjcm9Bc3NlbWJsZXJBUk02NDo6Z2V0Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklEQW5kSW52YWxp ZGF0ZSk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmdldENhY2hlZE1lbW9y eVRlbXBSZWdpc3RlcklEQW5kSW52YWxpZGF0ZSk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyQVJNNjQ6OmRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fz c2VtYmxlckFSTTY0OjpjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIpOgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTTY0Ojpsb2FkKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJB Uk02NDo6c3RvcmUpOgorICAgICAgICAqIGIzL2Fpci9BaXJPcGNvZGUub3Bjb2RlczoKKwogMjAx Ni0wMi0xMiAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBv ZmZsaW5lYXNtOiBFbWl0IER3YXJmMiBmaWxlIGFuZCBsb2NhdGlvbiBkaXJlY3RpdmVzIHRvIGFs bG93IGZvciBkZWJ1Z2dpbmcgLmFzbSBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAppbmRleCA2MzdlNWFlYjlkZTc2 ZWU4ZDgyNWVkYTMyYzQ0YzBjZjI2YWU1ZjYyLi44MDYzMjM3ZTI1ZWFlZmU0MTllZGI2ZWU2NzM4 YTgzN2I4ZjllYzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyQVJNNjQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaApAQCAtMTA0OSwxMCArMTA0OSwxMCBAQCBwdWJsaWM6 CiAgICAgCiAgICAgdm9pZCBsb2FkOChjb25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRl c3QpCiAgICAgewotICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoVHJ1c3RlZEltbVB0cihhZGRyZXNz KSwgbV9jYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNoZWRSZWco VHJ1c3RlZEltbVB0cihhZGRyZXNzKSwgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAg ICAgICBtX2Fzc2VtYmxlci5sZHJiKGRlc3QsIG1lbW9yeVRlbXBSZWdpc3RlciwgQVJNNjRSZWdp c3RlcnM6OnpyKTsKICAgICAgICAgaWYgKGRlc3QgPT0gbWVtb3J5VGVtcFJlZ2lzdGVyKQotICAg ICAgICAgICAgbV9jYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIuaW52YWxpZGF0ZSgpOworICAgICAg ICAgICAgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOwogICAgIH0KIAog ICAgIHZvaWQgbG9hZDhTaWduZWRFeHRlbmRUbzMyKEltcGxpY2l0QWRkcmVzcyBhZGRyZXNzLCBS ZWdpc3RlcklEIGRlc3QpCkBAIC0xMTI0LDcgKzExMjQsNyBAQCBwdWJsaWM6CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoaW1tLCBtX2Rh dGFNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNoZWRSZWcoaW1tLCBkYXRh TWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBzdG9yZTY0KGRhdGFUZW1wUmVnaXN0ZXIs IGFkZHJlc3MpOwogICAgIH0KIApAQCAtMTEzNSw3ICsxMTM1LDcgQEAgcHVibGljOgogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgbW92ZVRvQ2FjaGVkUmVnKGltbSwg bV9kYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgbW92ZVRvQ2FjaGVkUmVnKGltbSwg ZGF0YU1lbW9yeVRlbXBSZWdpc3RlcigpKTsKICAgICAgICAgc3RvcmU2NChkYXRhVGVtcFJlZ2lz dGVyLCBhZGRyZXNzKTsKICAgICB9CiAgICAgCkBAIC0xMTgwLDcgKzExODAsNyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBtb3ZlVG9DYWNoZWRS ZWcoaW1tLCBtX2RhdGFNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNoZWRS ZWcoaW1tLCBkYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBzdG9yZTMyKGRhdGFU ZW1wUmVnaXN0ZXIsIGFkZHJlc3MpOwogICAgIH0KIApAQCAtMTE5MSw3ICsxMTkxLDcgQEAgcHVi bGljOgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgbW92ZVRvQ2Fj aGVkUmVnKGltbSwgbV9kYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgbW92ZVRvQ2Fj aGVkUmVnKGltbSwgZGF0YU1lbW9yeVRlbXBSZWdpc3RlcigpKTsKICAgICAgICAgc3RvcmUzMihk YXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzKTsKICAgICB9CiAKQEAgLTEyMDIsNyArMTIwMiw3IEBA IHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIG1vdmVU b0NhY2hlZFJlZyhpbW0sIG1fZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgIG1vdmVU b0NhY2hlZFJlZyhpbW0sIGRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgIHN0b3Jl MzIoZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzcyk7CiAgICAgfQogCkBAIC0xNDk3LDcgKzE0OTcs NyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBsb2FkRG91YmxlKFRydXN0ZWRJbW1QdHIgYWRk cmVzcywgRlBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBtb3ZlVG9DYWNoZWRSZWco YWRkcmVzcywgbV9jYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICBtb3ZlVG9DYWNo ZWRSZWcoYWRkcmVzcywgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICBtX2Fz c2VtYmxlci5sZHI8NjQ+KGRlc3QsIG1lbW9yeVRlbXBSZWdpc3RlciwgQVJNNjRSZWdpc3RlcnM6 OnpyKTsKICAgICB9CiAKQEAgLTE2NDIsNyArMTY0Miw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg c3RvcmVEb3VibGUoRlBSZWdpc3RlcklEIHNyYywgVHJ1c3RlZEltbVB0ciBhZGRyZXNzKQogICAg IHsKLSAgICAgICAgbW92ZVRvQ2FjaGVkUmVnKGFkZHJlc3MsIG1fY2FjaGVkTWVtb3J5VGVtcFJl Z2lzdGVyKTsKKyAgICAgICAgbW92ZVRvQ2FjaGVkUmVnKGFkZHJlc3MsIGNhY2hlZE1lbW9yeVRl bXBSZWdpc3RlcigpKTsKICAgICAgICAgbV9hc3NlbWJsZXIuc3RyPDY0PihzcmMsIG1lbW9yeVRl bXBSZWdpc3RlciwgQVJNNjRSZWdpc3RlcnM6OnpyKTsKICAgICB9CiAKQEAgLTE5MDAsNyArMTkw MCw3IEBAIHB1YmxpYzoKICAgICAgICAgZWxzZSBpZiAoaXNVSW50MTIoLXJpZ2h0Lm1fdmFsdWUp KQogICAgICAgICAgICAgbV9hc3NlbWJsZXIuY21uPDMyPihsZWZ0LCBVSW50MTIoLXJpZ2h0Lm1f dmFsdWUpKTsKICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBtb3ZlVG9DYWNoZWRSZWcocmln aHQsIG1fZGF0YU1lbW9yeVRlbXBSZWdpc3Rlcik7CisgICAgICAgICAgICBtb3ZlVG9DYWNoZWRS ZWcocmlnaHQsIGRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIoKSk7CiAgICAgICAgICAgICBtX2Fzc2Vt Ymxlci5jbXA8MzI+KGxlZnQsIGRhdGFUZW1wUmVnaXN0ZXIpOwogICAgICAgICB9CiAgICAgICAg IHJldHVybiBKdW1wKG1ha2VCcmFuY2goY29uZCkpOwpAQCAtMTk2Niw3ICsxOTY2LDcgQEAgcHVi bGljOgogICAgICAgICBlbHNlIGlmIChpc1VJbnQxMigtaW1tZWRpYXRlKSkKICAgICAgICAgICAg IG1fYXNzZW1ibGVyLmNtbjw2ND4obGVmdCwgVUludDEyKHN0YXRpY19jYXN0PGludDMyX3Q+KC1p bW1lZGlhdGUpKSk7CiAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgbW92ZVRvQ2FjaGVkUmVn KHJpZ2h0LCBtX2RhdGFNZW1vcnlUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbW92ZVRvQ2Fj aGVkUmVnKHJpZ2h0LCBkYXRhTWVtb3J5VGVtcFJlZ2lzdGVyKCkpOwogICAgICAgICAgICAgbV9h c3NlbWJsZXIuY21wPDY0PihsZWZ0LCBkYXRhVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgfQogICAg ICAgICByZXR1cm4gSnVtcChtYWtlQnJhbmNoKGNvbmQpKTsKQEAgLTI4NzcsMTIgKzI4NzcsMjIg QEAgcHJpdmF0ZToKICAgICBBTFdBWVNfSU5MSU5FIFJlZ2lzdGVySUQgZ2V0Q2FjaGVkRGF0YVRl bXBSZWdpc3RlcklEQW5kSW52YWxpZGF0ZSgpCiAgICAgewogICAgICAgICBSRUxFQVNFX0FTU0VS VChtX2FsbG93U2NyYXRjaFJlZ2lzdGVyKTsKLSAgICAgICAgcmV0dXJuIG1fZGF0YU1lbW9yeVRl bXBSZWdpc3Rlci5yZWdpc3RlcklESW52YWxpZGF0ZSgpOworICAgICAgICByZXR1cm4gZGF0YU1l bW9yeVRlbXBSZWdpc3RlcigpLnJlZ2lzdGVySURJbnZhbGlkYXRlKCk7CiAgICAgfQogICAgIEFM V0FZU19JTkxJTkUgUmVnaXN0ZXJJRCBnZXRDYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXJJREFuZElu dmFsaWRhdGUoKQogICAgIHsKICAgICAgICAgUkVMRUFTRV9BU1NFUlQobV9hbGxvd1NjcmF0Y2hS ZWdpc3Rlcik7Ci0gICAgICAgIHJldHVybiBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlci5yZWdp c3RlcklESW52YWxpZGF0ZSgpOworICAgICAgICByZXR1cm4gY2FjaGVkTWVtb3J5VGVtcFJlZ2lz dGVyKCkucmVnaXN0ZXJJREludmFsaWRhdGUoKTsKKyAgICB9CisgICAgQUxXQVlTX0lOTElORSBD YWNoZWRUZW1wUmVnaXN0ZXImIGRhdGFNZW1vcnlUZW1wUmVnaXN0ZXIoKQorICAgIHsKKyAgICAg ICAgUkVMRUFTRV9BU1NFUlQobV9hbGxvd1NjcmF0Y2hSZWdpc3Rlcik7CisgICAgICAgIHJldHVy biBtX2RhdGFNZW1vcnlUZW1wUmVnaXN0ZXI7CisgICAgfQorICAgIEFMV0FZU19JTkxJTkUgQ2Fj aGVkVGVtcFJlZ2lzdGVyJiBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKQorICAgIHsKKyAgICAg ICAgUkVMRUFTRV9BU1NFUlQobV9hbGxvd1NjcmF0Y2hSZWdpc3Rlcik7CisgICAgICAgIHJldHVy biBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcjsKICAgICB9CiAKICAgICBBTFdBWVNfSU5MSU5F IGJvb2wgaXNJbkludFJhbmdlKGludHB0cl90IHZhbHVlKQpAQCAtMzAxNSwxMiArMzAyNSwxMiBA QCBwcml2YXRlOgogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBsb2FkKGNvbnN0IHZvaWQqIGFkZHJl c3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIGludHB0cl90IGN1cnJlbnRSZWdp c3RlckNvbnRlbnRzOwotICAgICAgICBpZiAobV9jYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIudmFs dWUoY3VycmVudFJlZ2lzdGVyQ29udGVudHMpKSB7CisgICAgICAgIGlmIChjYWNoZWRNZW1vcnlU ZW1wUmVnaXN0ZXIoKS52YWx1ZShjdXJyZW50UmVnaXN0ZXJDb250ZW50cykpIHsKICAgICAgICAg ICAgIGludHB0cl90IGFkZHJlc3NBc0ludCA9IHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGFk ZHJlc3MpOwogICAgICAgICAgICAgaW50cHRyX3QgYWRkcmVzc0RlbHRhID0gYWRkcmVzc0FzSW50 IC0gY3VycmVudFJlZ2lzdGVyQ29udGVudHM7CiAKICAgICAgICAgICAgIGlmIChkZXN0ID09IG1l bW9yeVRlbXBSZWdpc3RlcikKLSAgICAgICAgICAgICAgICBtX2NhY2hlZE1lbW9yeVRlbXBSZWdp c3Rlci5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICAgICAgY2FjaGVkTWVtb3J5VGVtcFJlZ2lz dGVyKCkuaW52YWxpZGF0ZSgpOwogCiAgICAgICAgICAgICBpZiAoaXNJbkludFJhbmdlKGFkZHJl c3NEZWx0YSkpIHsKICAgICAgICAgICAgICAgICBpZiAoQVJNNjRBc3NlbWJsZXI6OmNhbkVuY29k ZVNJbW1PZmZzZXQoYWRkcmVzc0RlbHRhKSkgewpAQCAtMzAzNiw3ICszMDQ2LDcgQEAgcHJpdmF0 ZToKIAogICAgICAgICAgICAgaWYgKChhZGRyZXNzQXNJbnQgJiAofm1hc2tIYWxmV29yZDApKSA9 PSAoY3VycmVudFJlZ2lzdGVyQ29udGVudHMgJiAofm1hc2tIYWxmV29yZDApKSkgewogICAgICAg ICAgICAgICAgIG1fYXNzZW1ibGVyLm1vdms8NjQ+KG1lbW9yeVRlbXBSZWdpc3RlciwgYWRkcmVz c0FzSW50ICYgbWFza0hhbGZXb3JkMCwgMCk7Ci0gICAgICAgICAgICAgICAgbV9jYWNoZWRNZW1v cnlUZW1wUmVnaXN0ZXIuc2V0VmFsdWUocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oYWRkcmVz cykpOworICAgICAgICAgICAgICAgIGNhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcigpLnNldFZhbHVl KHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGFkZHJlc3MpKTsKICAgICAgICAgICAgICAgICBt X2Fzc2VtYmxlci5sZHI8ZGF0YXNpemU+KGRlc3QsIG1lbW9yeVRlbXBSZWdpc3RlciwgQVJNNjRS ZWdpc3RlcnM6OnpyKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CkBA IC0zMDQ0LDkgKzMwNTQsOSBAQCBwcml2YXRlOgogCiAgICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0 cihhZGRyZXNzKSwgbWVtb3J5VGVtcFJlZ2lzdGVyKTsKICAgICAgICAgaWYgKGRlc3QgPT0gbWVt b3J5VGVtcFJlZ2lzdGVyKQotICAgICAgICAgICAgbV9jYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIu aW52YWxpZGF0ZSgpOworICAgICAgICAgICAgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkuaW52 YWxpZGF0ZSgpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2NhY2hlZE1lbW9yeVRlbXBS ZWdpc3Rlci5zZXRWYWx1ZShyZWludGVycHJldF9jYXN0PGludHB0cl90PihhZGRyZXNzKSk7Cisg ICAgICAgICAgICBjYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXIoKS5zZXRWYWx1ZShyZWludGVycHJl dF9jYXN0PGludHB0cl90PihhZGRyZXNzKSk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmxkcjxkYXRh c2l6ZT4oZGVzdCwgbWVtb3J5VGVtcFJlZ2lzdGVyLCBBUk02NFJlZ2lzdGVyczo6enIpOwogICAg IH0KIApAQCAtMzA1NSw3ICszMDY1LDcgQEAgcHJpdmF0ZToKICAgICB7CiAgICAgICAgIEFTU0VS VChzcmMgIT0gbWVtb3J5VGVtcFJlZ2lzdGVyKTsKICAgICAgICAgaW50cHRyX3QgY3VycmVudFJl Z2lzdGVyQ29udGVudHM7Ci0gICAgICAgIGlmIChtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlci52 YWx1ZShjdXJyZW50UmVnaXN0ZXJDb250ZW50cykpIHsKKyAgICAgICAgaWYgKGNhY2hlZE1lbW9y eVRlbXBSZWdpc3RlcigpLnZhbHVlKGN1cnJlbnRSZWdpc3RlckNvbnRlbnRzKSkgewogICAgICAg ICAgICAgaW50cHRyX3QgYWRkcmVzc0FzSW50ID0gcmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4o YWRkcmVzcyk7CiAgICAgICAgICAgICBpbnRwdHJfdCBhZGRyZXNzRGVsdGEgPSBhZGRyZXNzQXNJ bnQgLSBjdXJyZW50UmVnaXN0ZXJDb250ZW50czsKIApAQCAtMzA3MywxNCArMzA4MywxNCBAQCBw cml2YXRlOgogCiAgICAgICAgICAgICBpZiAoKGFkZHJlc3NBc0ludCAmICh+bWFza0hhbGZXb3Jk MCkpID09IChjdXJyZW50UmVnaXN0ZXJDb250ZW50cyAmICh+bWFza0hhbGZXb3JkMCkpKSB7CiAg ICAgICAgICAgICAgICAgbV9hc3NlbWJsZXIubW92azw2ND4obWVtb3J5VGVtcFJlZ2lzdGVyLCBh ZGRyZXNzQXNJbnQgJiBtYXNrSGFsZldvcmQwLCAwKTsKLSAgICAgICAgICAgICAgICBtX2NhY2hl ZE1lbW9yeVRlbXBSZWdpc3Rlci5zZXRWYWx1ZShyZWludGVycHJldF9jYXN0PGludHB0cl90Pihh ZGRyZXNzKSk7CisgICAgICAgICAgICAgICAgY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyKCkuc2V0 VmFsdWUocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oYWRkcmVzcykpOwogICAgICAgICAgICAg ICAgIG1fYXNzZW1ibGVyLnN0cjxkYXRhc2l6ZT4oc3JjLCBtZW1vcnlUZW1wUmVnaXN0ZXIsIEFS TTY0UmVnaXN0ZXJzOjp6cik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQogICAgICAgICB9CiAKICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MpLCBtZW1v cnlUZW1wUmVnaXN0ZXIpOwotICAgICAgICBtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rlci5zZXRW YWx1ZShyZWludGVycHJldF9jYXN0PGludHB0cl90PihhZGRyZXNzKSk7CisgICAgICAgIGNhY2hl ZE1lbW9yeVRlbXBSZWdpc3RlcigpLnNldFZhbHVlKHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+ KGFkZHJlc3MpKTsKICAgICAgICAgbV9hc3NlbWJsZXIuc3RyPGRhdGFzaXplPihzcmMsIG1lbW9y eVRlbXBSZWdpc3RlciwgQVJNNjRSZWdpc3RlcnM6OnpyKTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyT3Bjb2RlLm9wY29kZXMgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpck9wY29kZS5vcGNvZGVzCmluZGV4IDRhZDE4Yjc5NmMw NjhlZjUzZTQ2N2U2ZGNkMmFhNTNjMjhiOGNmOTEuLjAyY2YzZTRkODZlZmQ4OTI2ZmVlNmU0OGE3 M2MyYTUwY2Q1MjcxYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIv QWlyT3Bjb2RlLm9wY29kZXMKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJP cGNvZGUub3Bjb2RlcwpAQCAtNDk4LDIzICs0OTgsMjMgQEAgU2lnbkV4dGVuZDMyVG9QdHIgVTpH OjMyLCBEOkc6UHRyCiAKIFplcm9FeHRlbmQ4VG8zMiBVOkc6OCwgWkQ6RzozMgogICAgIFRtcCwg VG1wCi0gICAgQWRkciwgVG1wIGFzIGxvYWQ4Ci0gICAgSW5kZXgsIFRtcCBhcyBsb2FkOAorICAg IHg4NjogQWRkciwgVG1wIGFzIGxvYWQ4CisgICAgeDg2OiBJbmRleCwgVG1wIGFzIGxvYWQ4CiAK IFNpZ25FeHRlbmQ4VG8zMiBVOkc6OCwgWkQ6RzozMgogICAgIFRtcCwgVG1wCi0gICAgQWRkciwg VG1wIGFzIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMgotICAgIEluZGV4LCBUbXAgYXMgbG9hZDhTaWdu ZWRFeHRlbmRUbzMyCisgICAgeDg2OiBBZGRyLCBUbXAgYXMgbG9hZDhTaWduZWRFeHRlbmRUbzMy CisgICAgeDg2OiBJbmRleCwgVG1wIGFzIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMgogCiBaZXJvRXh0 ZW5kMTZUbzMyIFU6RzoxNiwgWkQ6RzozMgogICAgIFRtcCwgVG1wCi0gICAgQWRkciwgVG1wIGFz IGxvYWQxNgotICAgIEluZGV4LCBUbXAgYXMgbG9hZDE2CisgICAgeDg2OiBBZGRyLCBUbXAgYXMg bG9hZDE2CisgICAgeDg2OiBJbmRleCwgVG1wIGFzIGxvYWQxNgogCiBTaWduRXh0ZW5kMTZUbzMy IFU6RzoxNiwgWkQ6RzozMgogICAgIFRtcCwgVG1wCi0gICAgQWRkciwgVG1wIGFzIGxvYWQxNlNp Z25lZEV4dGVuZFRvMzIKLSAgICBJbmRleCwgVG1wIGFzIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIK KyAgICB4ODY6IEFkZHIsIFRtcCBhcyBsb2FkMTZTaWduZWRFeHRlbmRUbzMyCisgICAgeDg2OiBJ bmRleCwgVG1wIGFzIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIKIAogTW92ZUZsb2F0IFU6RjozMiwg RDpGOjMyCiAgICAgVG1wLCBUbXAgYXMgbW92ZURvdWJsZQo=