175142 2017-08-03 11:25:14 -0700 Rename ScratchBuffer::activeLengthPtr to addressOfActiveLength. 2017-08-03 12:17:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam buildbot commit-queue fpizlo keith_miller msaboff saam webkit-bug-importer oldest_to_newest 1334848 0 mark.lam 2017-08-03 11:25:14 -0700 The convention in the rest of of JSC for such methods which return the address of a field is to name them "addressOf<field name>". We'll rename ScratchBuffer::activeLengthPtr to be consistent with this convention. 1334849 1 webkit-bug-importer 2017-08-03 11:26:30 -0700 <rdar://problem/33704528> 1334853 2 317132 mark.lam 2017-08-03 11:31:48 -0700 Created attachment 317132 proposed patch. 1334858 3 317132 mark.lam 2017-08-03 11:37:34 -0700 Comment on attachment 317132 proposed patch. Thanks for the review. 1334879 4 317132 commit-queue 2017-08-03 12:17:17 -0700 Comment on attachment 317132 proposed patch. Clearing flags on attachment: 317132 Committed r220219: <http://trac.webkit.org/changeset/220219> 1334880 5 commit-queue 2017-08-03 12:17:18 -0700 All reviewed patches have been landed. Closing bug. 317132 2017-08-03 11:31:48 -0700 2017-08-03 12:17:17 -0700 proposed patch. bug-175142.patch text/plain 14201 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIwMjEzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDE3LTA4LTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgU2NyYXRjaEJ1ZmZlcjo6YWN0aXZlTGVuZ3RoUHRyIHRvIGFkZHJlc3NPZkFjdGl2ZUxl bmd0aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NTE0MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzM3MDQ1Mjg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNvbnZlbnRpb24gaW4gdGhlIHJl c3Qgb2Ygb2YgSlNDIGZvciBzdWNoIG1ldGhvZHMgd2hpY2ggcmV0dXJuIHRoZSBhZGRyZXNzIG9m CisgICAgICAgIGEgZmllbGQgaXMgdG8gbmFtZSB0aGVtICJhZGRyZXNzT2Y8ZmllbGQgbmFtZT4i LiAgV2UnbGwgcmVuYW1lCisgICAgICAgIFNjcmF0Y2hCdWZmZXI6OmFjdGl2ZUxlbmd0aFB0ciB0 byBiZSBjb25zaXN0ZW50IHdpdGggdGhpcyBjb252ZW50aW9uLgorCisgICAgICAgICogZGZnL0RG R1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6 Y29tcGlsZU5ld0FycmF5V2l0aFNwcmVhZCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZl SklUMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxl KToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorICAgICAgICAqIGRmZy9ERkdUaHVua3Mu Y3BwOgorICAgICAgICAoSlNDOjpERkc6Om9zckV4aXRHZW5lcmF0aW9uVGh1bmtHZW5lcmF0b3Ip OgorICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6 OkRGRzo6TG93ZXJERkdUb0IzOjpjb21waWxlTmV3QXJyYXkpOgorICAgICAgICAoSlNDOjpGVEw6 OkRGRzo6TG93ZXJERkdUb0IzOjpjb21waWxlTmV3QXJyYXlXaXRoU3ByZWFkKToKKyAgICAgICAg KiBmdGwvRlRMVGh1bmtzLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpnZW5lcmljR2VuZXJhdGlv blRodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKiBqaXQvQXNzZW1ibHlIZWxwZXJzLmNwcDoKKyAg ICAgICAgKEpTQzo6QXNzZW1ibHlIZWxwZXJzOjpkZWJ1Z0NhbGwpOgorICAgICAgICAqIGppdC9T Y3JhdGNoUmVnaXN0ZXJBbGxvY2F0b3IuY3BwOgorICAgICAgICAoSlNDOjpTY3JhdGNoUmVnaXN0 ZXJBbGxvY2F0b3I6OnByZXNlcnZlVXNlZFJlZ2lzdGVyc1RvU2NyYXRjaEJ1ZmZlckZvckNhbGwp OgorICAgICAgICAoSlNDOjpTY3JhdGNoUmVnaXN0ZXJBbGxvY2F0b3I6OnJlc3RvcmVVc2VkUmVn aXN0ZXJzRnJvbVNjcmF0Y2hCdWZmZXJGb3JDYWxsKToKKyAgICAgICAgKiBydW50aW1lL1ZNLmg6 CisgICAgICAgIChKU0M6OlNjcmF0Y2hCdWZmZXI6OmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCk6Cisg ICAgICAgIChKU0M6OlNjcmF0Y2hCdWZmZXI6OmFjdGl2ZUxlbmd0aFB0cik6IERlbGV0ZWQuCisg ICAgICAgICogd2FzbS9XYXNtQmluZGluZy5jcHA6CisgICAgICAgIChKU0M6Oldhc206Ondhc21U b0pzKToKKwogMjAxNy0wOC0wMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHN0YWNrIHRyYWNlIGluZm9ybWF0aW9uIGZvciBl YWNoIFJlY29yZGluZ0FjdGlvbgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCShyZXZpc2lvbiAyMjAxNjApCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOTI2LDcgKzM5MjYsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21w aWxlKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICBHUFJUZW1wb3Jhcnkgc2NyYXRjaCh0aGlzKTsK IAogICAgICAgICAgICAgLy8gVGVsbCBHQyBtYXJrIHBoYXNlIGhvdyBtdWNoIG9mIHRoZSBzY3Jh dGNoIGJ1ZmZlciBpcyBhY3RpdmUgZHVyaW5nIGNhbGwuCi0gICAgICAgICAgICBtX2ppdC5tb3Zl KFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWN0aXZlTGVuZ3RoUHRyKCkpLCBzY3JhdGNo LmdwcigpKTsKKyAgICAgICAgICAgIG1faml0Lm1vdmUoVHJ1c3RlZEltbVB0cihzY3JhdGNoQnVm ZmVyLT5hZGRyZXNzT2ZBY3RpdmVMZW5ndGgoKSksIHNjcmF0Y2guZ3ByKCkpOwogICAgICAgICAg ICAgbV9qaXQuc3RvcmVQdHIoVHJ1c3RlZEltbVB0cihzY3JhdGNoU2l6ZSksIHNjcmF0Y2guZ3By KCkpOwogICAgICAgICB9CiAKQEAgLTM5NDAsNyArMzk0MCw3IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgaWYgKHNjcmF0Y2hTaXplKSB7CiAgICAg ICAgICAgICBHUFJUZW1wb3Jhcnkgc2NyYXRjaCh0aGlzKTsKIAotICAgICAgICAgICAgbV9qaXQu bW92ZShUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSwgc2Ny YXRjaC5ncHIoKSk7CisgICAgICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRj aEJ1ZmZlci0+YWRkcmVzc09mQWN0aXZlTGVuZ3RoKCkpLCBzY3JhdGNoLmdwcigpKTsKICAgICAg ICAgICAgIG1faml0LnN0b3JlUHRyKFRydXN0ZWRJbW1QdHIoMCksIHNjcmF0Y2guZ3ByKCkpOwog ICAgICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRp dmVKSVQ2NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVDY0LmNwcAkocmV2aXNpb24gMjIwMTYwKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEz Myw3ICs0MTMzLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQog ICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHNjcmF0Y2godGhpcyk7CiAKICAgICAgICAgICAgIC8v IFRlbGwgR0MgbWFyayBwaGFzZSBob3cgbXVjaCBvZiB0aGUgc2NyYXRjaCBidWZmZXIgaXMgYWN0 aXZlIGR1cmluZyBjYWxsLgotICAgICAgICAgICAgbV9qaXQubW92ZShUcnVzdGVkSW1tUHRyKHNj cmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSwgc2NyYXRjaC5ncHIoKSk7CisgICAgICAg ICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWRkcmVzc09mQWN0 aXZlTGVuZ3RoKCkpLCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgICAgIG1faml0LnN0b3JlUHRy KFRydXN0ZWRJbW1QdHIoc2NyYXRjaFNpemUpLCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgfQog CkBAIC00MTQ3LDcgKzQxNDcsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUq IG5vZGUpCiAgICAgICAgIGlmIChzY3JhdGNoU2l6ZSkgewogICAgICAgICAgICAgR1BSVGVtcG9y YXJ5IHNjcmF0Y2godGhpcyk7CiAKLSAgICAgICAgICAgIG1faml0Lm1vdmUoVHJ1c3RlZEltbVB0 cihzY3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIHNjcmF0Y2guZ3ByKCkpOworICAg ICAgICAgICAgbV9qaXQubW92ZShUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFkZHJlc3NP ZkFjdGl2ZUxlbmd0aCgpKSwgc2NyYXRjaC5ncHIoKSk7CiAgICAgICAgICAgICBtX2ppdC5zdG9y ZVB0cihUcnVzdGVkSW1tUHRyKDApLCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgfQogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAko cmV2aXNpb24gMjIwMTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxh dGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyMjksNyArNzIyOSw3IEBAIHZvaWQgU3Bl Y3VsYXRpdmVKSVQ6OmNvbXBpbGVOZXdBcnJheVdpdGgKIAogICAgIHsKICAgICAgICAgR1BSVGVt cG9yYXJ5IHNjcmF0Y2godGhpcyk7Ci0gICAgICAgIG1faml0Lm1vdmUoVHJ1c3RlZEltbVB0cihz Y3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIHNjcmF0Y2guZ3ByKCkpOworICAgICAg ICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWRkcmVzc09mQWN0aXZl TGVuZ3RoKCkpLCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgbV9qaXQuc3RvcmVQdHIoVHJ1c3Rl ZEltbVB0cihzY3JhdGNoU2l6ZSksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHNjcmF0Y2guZ3By KCkpKTsKICAgICB9CiAKQEAgLTcyNDIsNyArNzI0Miw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVOZXdBcnJheVdpdGgKICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOwogICAgIHsK ICAgICAgICAgR1BSVGVtcG9yYXJ5IHNjcmF0Y2godGhpcyk7Ci0gICAgICAgIG1faml0Lm1vdmUo VHJ1c3RlZEltbVB0cihzY3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIHNjcmF0Y2gu Z3ByKCkpOworICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+ YWRkcmVzc09mQWN0aXZlTGVuZ3RoKCkpLCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgbV9qaXQu c3RvcmVQdHIoVHJ1c3RlZEltbVB0cigwKSwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc2NyYXRj aC5ncHIoKSkpOwogICAgIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdU aHVua3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVGh1 bmtzLmNwcAkocmV2aXNpb24gMjIwMTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdUaHVua3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly aWdodCAoQykgMjAxMSwgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTEtMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTY0LDcgKzY0LDcgQEAgTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmIG9zckV4aXRHZW5lcmF0aW9uVAogICAgIH0KICAgICAKICAgICAvLyBUZWxs IEdDIG1hcmsgcGhhc2UgaG93IG11Y2ggb2YgdGhlIHNjcmF0Y2ggYnVmZmVyIGlzIGFjdGl2ZSBk dXJpbmcgY2FsbC4KLSAgICBqaXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihz Y3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIEdQUkluZm86OnJlZ1QwKTsKKyAgICBq aXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihzY3JhdGNoQnVmZmVyLT5hZGRy ZXNzT2ZBY3RpdmVMZW5ndGgoKSksIEdQUkluZm86OnJlZ1QwKTsKICAgICBqaXQuc3RvcmVQdHIo TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoc2NyYXRjaFNpemUpLCBNYWNyb0Fzc2VtYmxl cjo6QWRkcmVzcyhHUFJJbmZvOjpyZWdUMCkpOwogCiAgICAgLy8gU2V0IHVwIG9uZSBhcmd1bWVu dC4KQEAgLTc2LDcgKzc2LDcgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIG9zckV4aXRHZW5lcmF0 aW9uVAogCiAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgZnVuY3Rpb25DYWxsID0gaml0LmNhbGwo KTsKIAotICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hC dWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSwgR1BSSW5mbzo6cmVnVDApOworICAgIGppdC5tb3Zl KE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFkZHJlc3NPZkFj dGl2ZUxlbmd0aCgpKSwgR1BSSW5mbzo6cmVnVDApOwogICAgIGppdC5zdG9yZVB0cihNYWNyb0Fz c2VtYmxlcjo6VHJ1c3RlZEltbVB0cigwKSwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoR1BSSW5m bzo6cmVnVDApKTsKIAogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBGUFJJbmZvOjpudW1i ZXJPZlJlZ2lzdGVyczsgKytpKSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZU TExvd2VyREZHVG9CMy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0 bC9GVExMb3dlckRGR1RvQjMuY3BwCShyZXZpc2lvbiAyMjAxNjApCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2NzQs MTQgKzQ2NzQsMTQgQEAgcHJpdmF0ZToKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgbV9v dXQuc3RvcmVQdHIoCi0gICAgICAgICAgICBtX291dC5jb25zdEludFB0cihzY3JhdGNoU2l6ZSks IG1fb3V0LmFic29sdXRlKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSk7CisgICAg ICAgICAgICBtX291dC5jb25zdEludFB0cihzY3JhdGNoU2l6ZSksIG1fb3V0LmFic29sdXRlKHNj cmF0Y2hCdWZmZXItPmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCgpKSk7CiAgICAgICAgIAogICAgICAg ICBMVmFsdWUgcmVzdWx0ID0gdm1DYWxsKAogICAgICAgICAgICAgSW50NjQsIG1fb3V0Lm9wZXJh dGlvbihvcGVyYXRpb25OZXdBcnJheSksIG1fY2FsbEZyYW1lLAogICAgICAgICAgICAgd2Vha1N0 cnVjdHVyZShzdHJ1Y3R1cmUpLCBtX291dC5jb25zdEludFB0cihidWZmZXIpLAogICAgICAgICAg ICAgbV9vdXQuY29uc3RJbnRQdHIobV9ub2RlLT5udW1DaGlsZHJlbigpKSk7CiAgICAgICAgIAot ICAgICAgICBtX291dC5zdG9yZVB0cihtX291dC5pbnRQdHJaZXJvLCBtX291dC5hYnNvbHV0ZShz Y3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSkpOworICAgICAgICBtX291dC5zdG9yZVB0 cihtX291dC5pbnRQdHJaZXJvLCBtX291dC5hYnNvbHV0ZShzY3JhdGNoQnVmZmVyLT5hZGRyZXNz T2ZBY3RpdmVMZW5ndGgoKSkpOwogICAgICAgICAKICAgICAgICAgc2V0SlNWYWx1ZShyZXN1bHQp OwogICAgIH0KQEAgLTQ4MzYsOSArNDgzNiw5IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX291 dC5zdG9yZTY0KHZhbHVlLCBtX291dC5hYnNvbHV0ZSgmYnVmZmVyW2ldKSk7CiAgICAgICAgIH0K IAotICAgICAgICBtX291dC5zdG9yZVB0cihtX291dC5jb25zdEludFB0cihzY3JhdGNoU2l6ZSks IG1fb3V0LmFic29sdXRlKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSk7CisgICAg ICAgIG1fb3V0LnN0b3JlUHRyKG1fb3V0LmNvbnN0SW50UHRyKHNjcmF0Y2hTaXplKSwgbV9vdXQu YWJzb2x1dGUoc2NyYXRjaEJ1ZmZlci0+YWRkcmVzc09mQWN0aXZlTGVuZ3RoKCkpKTsKICAgICAg ICAgTFZhbHVlIHJlc3VsdCA9IHZtQ2FsbChJbnQ2NCwgbV9vdXQub3BlcmF0aW9uKG9wZXJhdGlv bk5ld0FycmF5V2l0aFNwcmVhZFNsb3cpLCBtX2NhbGxGcmFtZSwgbV9vdXQuY29uc3RJbnRQdHIo YnVmZmVyKSwgbV9vdXQuY29uc3RJbnQzMihtX25vZGUtPm51bUNoaWxkcmVuKCkpKTsKLSAgICAg ICAgbV9vdXQuc3RvcmVQdHIobV9vdXQuY29uc3RJbnRQdHIoMCksIG1fb3V0LmFic29sdXRlKHNj cmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSk7CisgICAgICAgIG1fb3V0LnN0b3JlUHRy KG1fb3V0LmNvbnN0SW50UHRyKDApLCBtX291dC5hYnNvbHV0ZShzY3JhdGNoQnVmZmVyLT5hZGRy ZXNzT2ZBY3RpdmVMZW5ndGgoKSkpOwogCiAgICAgICAgIHNldEpTVmFsdWUocmVzdWx0KTsKICAg ICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFRodW5rcy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExUaHVua3MuY3BwCShyZXZpc2lv biAyMjAxNjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFRodW5rcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE3 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucwpAQCAtNzksNyArNzksNyBAQCBzdGF0aWMgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGdl bmVyaWNHZW5lCiAgICAgc2F2ZUFsbFJlZ2lzdGVycyhqaXQsIGJ1ZmZlcik7CiAgICAgCiAgICAg Ly8gVGVsbCBHQyBtYXJrIHBoYXNlIGhvdyBtdWNoIG9mIHRoZSBzY3JhdGNoIGJ1ZmZlciBpcyBh Y3RpdmUgZHVyaW5nIGNhbGwuCi0gICAgaml0Lm1vdmUoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJ bW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWN0aXZlTGVuZ3RoUHRyKCkpLCBHUFJJbmZvOjpub25BcmdH UFIwKTsKKyAgICBqaXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihzY3JhdGNo QnVmZmVyLT5hZGRyZXNzT2ZBY3RpdmVMZW5ndGgoKSksIEdQUkluZm86Om5vbkFyZ0dQUjApOwog ICAgIGppdC5zdG9yZVB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihyZXF1aXJlZFNj cmF0Y2hNZW1vcnlTaXplSW5CeXRlcygpKSwgR1BSSW5mbzo6bm9uQXJnR1BSMCk7CiAKICAgICBq aXQubG9hZFB0cihHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6YXJndW1lbnRH UFIwKTsKQEAgLTk2LDcgKzk2LDcgQEAgc3RhdGljIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBnZW5l cmljR2VuZQogICAgIGppdC5tb3ZlKEdQUkluZm86OnJldHVyblZhbHVlR1BSLCBHUFJJbmZvOjpy ZWdUMCk7CiAgICAgCiAgICAgLy8gTWFrZSBzdXJlIHdlIHRlbGwgdGhlIEdDIHRoYXQgd2UncmUg bm90IHVzaW5nIHRoZSBzY3JhdGNoIGJ1ZmZlciBhbnltb3JlLgotICAgIGppdC5tb3ZlKE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigp KSwgR1BSSW5mbzo6cmVnVDEpOworICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVk SW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCgpKSwgR1BSSW5mbzo6 cmVnVDEpOwogICAgIGppdC5zdG9yZVB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cigw KSwgR1BSSW5mbzo6cmVnVDEpOwogICAgIAogICAgIC8vIFByZXBhcmUgZm9yIHRhaWwgY2FsbC4K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5jcHAJ KHJldmlzaW9uIDIyMDE2MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlI ZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODM5LDcgKzgzOSw3IEBAIHZvaWQgQXNzZW1i bHlIZWxwZXJzOjpkZWJ1Z0NhbGwoVk0mIHZtLCAKICAgICB9CiAKICAgICAvLyBUZWxsIEdDIG1h cmsgcGhhc2UgaG93IG11Y2ggb2YgdGhlIHNjcmF0Y2ggYnVmZmVyIGlzIGFjdGl2ZSBkdXJpbmcg Y2FsbC4KLSAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWN0aXZlTGVuZ3Ro UHRyKCkpLCBHUFJJbmZvOjpyZWdUMCk7CisgICAgbW92ZShUcnVzdGVkSW1tUHRyKHNjcmF0Y2hC dWZmZXItPmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCgpKSwgR1BSSW5mbzo6cmVnVDApOwogICAgIHN0 b3JlUHRyKFRydXN0ZWRJbW1QdHIoc2NyYXRjaFNpemUpLCBHUFJJbmZvOjpyZWdUMCk7CiAKICNp ZiBDUFUoWDg2XzY0KSB8fCBDUFUoQVJNKSB8fCBDUFUoQVJNNjQpIHx8IENQVShNSVBTKQpAQCAt ODU4LDcgKzg1OCw3IEBAIHZvaWQgQXNzZW1ibHlIZWxwZXJzOjpkZWJ1Z0NhbGwoVk0mIHZtLCAK ICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIocmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oZnVuY3Rpb24p KSwgc2NyYXRjaCk7CiAgICAgY2FsbChzY3JhdGNoKTsKIAotICAgIG1vdmUoVHJ1c3RlZEltbVB0 cihzY3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIEdQUkluZm86OnJlZ1QwKTsKKyAg ICBtb3ZlKFRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWRkcmVzc09mQWN0aXZlTGVuZ3Ro KCkpLCBHUFJJbmZvOjpyZWdUMCk7CiAgICAgc3RvcmVQdHIoVHJ1c3RlZEltbVB0cigwKSwgR1BS SW5mbzo6cmVnVDApOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IEZQUkluZm86Om51 bWJlck9mUmVnaXN0ZXJzOyArK2kpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv U2NyYXRjaFJlZ2lzdGVyQWxsb2NhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L1NjcmF0Y2hSZWdpc3RlckFsbG9jYXRvci5jcHAJKHJldmlzaW9uIDIyMDE2 MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvU2NyYXRjaFJlZ2lzdGVyQWxsb2NhdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTQsIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDE0LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xODksNyArMTg5LDcgQEAgdm9pZCBTY3JhdGNoUmVn aXN0ZXJBbGxvY2F0b3I6OnByZXNlcnZlVQogICAgIH0KICAgICBSRUxFQVNFX0FTU0VSVChjb3Vu dCAqIHNpemVvZihKU1ZhbHVlKSA9PSBkZXNpcmVkU2NyYXRjaEJ1ZmZlclNpemVGb3JDYWxsKCkp OwogICAgIAotICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0 Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigpKSwgc2NyYXRjaEdQUik7CisgICAgaml0Lm1vdmUo TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWRkcmVzc09mQWN0 aXZlTGVuZ3RoKCkpLCBzY3JhdGNoR1BSKTsKICAgICBqaXQuc3RvcmVQdHIoTWFjcm9Bc3NlbWJs ZXI6OlRydXN0ZWRJbW1QdHIoc3RhdGljX2Nhc3Q8c2l6ZV90Pihjb3VudCAqIHNpemVvZihKU1Zh bHVlKSkpLCBzY3JhdGNoR1BSKTsKIH0KIApAQCAtMjEwLDcgKzIxMCw3IEBAIHZvaWQgU2NyYXRj aFJlZ2lzdGVyQWxsb2NhdG9yOjpyZXN0b3JlVXMKICAgICB9CiAgICAgUkVMRUFTRV9BU1NFUlQo c2NyYXRjaEdQUiAhPSBJbnZhbGlkR1BSUmVnKTsKICAgICAKLSAgICBqaXQubW92ZShNYWNyb0Fz c2VtYmxlcjo6VHJ1c3RlZEltbVB0cihzY3JhdGNoQnVmZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSks IHNjcmF0Y2hHUFIpOworICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRy KHNjcmF0Y2hCdWZmZXItPmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCgpKSwgc2NyYXRjaEdQUik7CiAg ICAgaml0LnN0b3JlUHRyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKDApLCBzY3JhdGNo R1BSKTsKIAogICAgIC8vIFJlc3RvcmUgZG91YmxlIHJlZ2lzdGVycyBmaXJzdC4KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAkocmV2aXNpb24gMjIwMTYwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAkod29ya2luZyBjb3B5KQpAQCAtMjIyLDcgKzIyMiw3 IEBAIHN0cnVjdCBTY3JhdGNoQnVmZmVyIHsKICAgICBzdGF0aWMgc2l6ZV90IGFsbG9jYXRpb25T aXplKENoZWNrZWQ8c2l6ZV90PiBidWZmZXJTaXplKSB7IHJldHVybiAoc2l6ZW9mKFNjcmF0Y2hC dWZmZXIpICsgYnVmZmVyU2l6ZSkudW5zYWZlR2V0KCk7IH0KICAgICB2b2lkIHNldEFjdGl2ZUxl bmd0aChzaXplX3QgYWN0aXZlTGVuZ3RoKSB7IHUubV9hY3RpdmVMZW5ndGggPSBhY3RpdmVMZW5n dGg7IH0KICAgICBzaXplX3QgYWN0aXZlTGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gdS5tX2FjdGl2 ZUxlbmd0aDsgfTsKLSAgICBzaXplX3QqIGFjdGl2ZUxlbmd0aFB0cigpIHsgcmV0dXJuICZ1Lm1f YWN0aXZlTGVuZ3RoOyB9OworICAgIHNpemVfdCogYWRkcmVzc09mQWN0aXZlTGVuZ3RoKCkgeyBy ZXR1cm4gJnUubV9hY3RpdmVMZW5ndGg7IH07CiAgICAgdm9pZCogZGF0YUJ1ZmZlcigpIHsgcmV0 dXJuIG1fYnVmZmVyOyB9CiAKICAgICB1bmlvbiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtQmluZGluZy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vV2FzbUJpbmRpbmcuY3BwCShyZXZpc2lvbiAyMjAxNjApCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9XYXNtQmluZGluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNSw3 ICsyMDUsNyBAQCBFeHBlY3RlZDxNYWNyb0Fzc2VtYmxlckNvZGVSZWYsIEJpbmRpbmdGCiAgICAg ICAgIGppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpz dGFja1BvaW50ZXJSZWdpc3RlciksIHNjcmF0Y2hHUFIpOwogICAgICAgICBpZiAoYXJnQ291bnQp IHsKICAgICAgICAgICAgIC8vIFRoZSBHQyBzaG91bGQgbm90IGxvb2sgYXQgdGhpcyBidWZmZXIg YXQgYWxsLCB0aGVzZSBhcmVuJ3QgSlNWYWx1ZXMuCi0gICAgICAgICAgICBqaXQubW92ZShDQ2Fs bEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoc2NyYXRjaEJ1ZmZlci0+YWN0aXZlTGVuZ3RoUHRyKCkp LCBHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgICAgICAgICAgaml0Lm1vdmUoQ0NhbGxIZWxw ZXJzOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFkZHJlc3NPZkFjdGl2ZUxlbmd0aCgp KSwgR1BSSW5mbzo6YXJndW1lbnRHUFIwKTsKICAgICAgICAgICAgIGppdC5zdG9yZVB0cihDQ2Fs bEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoMCksIEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CiAgICAg ICAgIH0KIAo=