181407 2018-01-08 15:04:52 -0800 [RenderTreeBuilder] Transition Render*::addChild() calls to RenderTreeBuilder::insertChildToRender*() 2018-01-09 07:22:19 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1386946 0 zalan 2018-01-08 15:04:52 -0800 ssia. 1386947 1 webkit-bug-importer 2018-01-08 15:05:29 -0800 <rdar://problem/36361176> 1386949 2 330743 zalan 2018-01-08 15:07:23 -0800 Created attachment 330743 Patch 1387105 3 330790 zalan 2018-01-08 20:59:25 -0800 Created attachment 330790 Patch 1387252 4 330790 commit-queue 2018-01-09 07:22:17 -0800 Comment on attachment 330790 Patch Clearing flags on attachment: 330790 Committed r226632: <https://trac.webkit.org/changeset/226632> 1387253 5 commit-queue 2018-01-09 07:22:19 -0800 All reviewed patches have been landed. Closing bug. 330743 2018-01-08 15:07:23 -0800 2018-01-08 20:59:24 -0800 Patch bug-181407-20180108150722.patch text/plain 8423 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM3MjA0NzU4ZjZiYjYw MDYxOGIwZTI0ZjUxYTU3ZGY3ZDQ1NGJhMi4uOThhNjM2YzUzYTZhNTFkM2M0MWE5Y2U0MDllMGI2 MzAwNmQ3Zjg2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAxLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBUcmFuc2l0aW9uIFJlbmRlcio6OmFkZENoaWxkKCkgY2FsbHMgdG8gUmVuZGVyVHJlZUJ1aWxk ZXI6Omluc2VydENoaWxkVG9SZW5kZXIqKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4MTQwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYzNjEx NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXZl bnR1YWxseSBhbGwgbXV0YXRpb24gd2lsbCBiZSBnb2luZyB0aHJvdWdoIHRoZSBSZW5kZXJUcmVl QnVpbGRlci4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy aWQ6OmFkZENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bv c3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSdWJ5 UnVuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJ1YnlSdW46OnJ1YnlCYXNlU2FmZSk6 CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2tGbG93 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpCbG9ja0Zsb3c6Omlu c2VydENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJNdWx0aUNvbHVtbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6 TXVsdGlDb2x1bW46OmNyZWF0ZUZyYWdtZW50ZWRGbG93KToKKyAgICAgICAgKiByZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZCk6CisKIDIw MTgtMDEtMDggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVu ZGVyVHJlZUJ1aWxkZXJdIE1vdmUgUmVuZGVyQmxvY2tGbG93IGFkZENoaWxkIGxvZ2ljIHRvIFJl bmRlclRyZWVCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5k ZXggNzc2NTQyMGY3NGZlMGU4Y2RkZDZhNjE2NGFjNjJkYmVmNWE3NDU0OC4uN2FhZWIxNjIyNDc2 ODdmMDE1NWRkNzkxM2M0ZjIzZGVmNTA1ZWM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcApAQCAtNzIsNyArNzIsNyBAQCBSZW5kZXJHcmlkOjp+UmVuZGVyR3JpZCgp ID0gZGVmYXVsdDsKIHZvaWQgUmVuZGVyR3JpZDo6YWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXIm IGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kZXJPYmplY3Qq IGJlZm9yZUNoaWxkKQogewogICAgIGF1dG8mIGNoaWxkID0gKm5ld0NoaWxkOwotICAgIFJlbmRl ckJsb2NrOjphZGRDaGlsZChidWlsZGVyLCBXVEZNb3ZlKG5ld0NoaWxkKSwgYmVmb3JlQ2hpbGQp OworICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrKCp0aGlzLCBXVEZNb3ZlKG5l d0NoaWxkKSwgYmVmb3JlQ2hpbGQpOwogCiAgICAgLy8gUG9zaXRpb25lZCBncmlkIGl0ZW1zIGRv IG5vdCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lzZSBwYXJ0aWNpcGF0ZSBpbiB0aGUgbGF5b3V0 IG9mIHRoZSBncmlkLAogICAgIC8vIGZvciB0aGF0IHJlYXNvbiB3ZSBkb24ndCBuZWVkIHRvIG1h cmsgdGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5IGFyZSBhZGRlZC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKaW5kZXggYzI3NDgx MjE0NzZiNzIxNmJjMzcyMzg2ZDFlYmExNWZmNjIwNTcxZS4uMTdmZmVkNWRjYWI0NmU2NmRmYWY1 NDc3NTIyZTBjMmUyODU5NmMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKQEAgLTI5OCw3ICsyOTgsNyBAQCBSZW5kZXJPYmpl Y3QqIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bvc3NpYmxlU3Bhbm5lckRlc2NlbmRh bnQoUmVuZGVyT2JqZQogICAgICAgICAKICAgICAgICAgLy8gVGhpcyBpcyBhIGd1YXJkIHRvIHN0 b3AgYW4gYW5jZXN0b3IgZmxvdyB0aHJlYWQgZnJvbSBwcm9jZXNzaW5nIHRoZSBzcGFubmVyLgog ICAgICAgICBnU2hpZnRpbmdTcGFubmVyID0gdHJ1ZTsKLSAgICAgICAgbXVsdGljb2xDb250YWlu ZXItPlJlbmRlckJsb2NrOjphZGRDaGlsZCgqUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKSwg V1RGTW92ZSh0YWtlbkRlc2NlbmRhbnQpLCBpbnNlcnRCZWZvcmVNdWx0aWNvbENoaWxkKTsKKyAg ICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKS0+aW5zZXJ0Q2hpbGRUb1JlbmRlckJs b2NrKCptdWx0aWNvbENvbnRhaW5lciwgV1RGTW92ZSh0YWtlbkRlc2NlbmRhbnQpLCBpbnNlcnRC ZWZvcmVNdWx0aWNvbENoaWxkKTsKICAgICAgICAgZ1NoaWZ0aW5nU3Bhbm5lciA9IGZhbHNlOwog ICAgICAgICAKICAgICAgICAgLy8gVGhlIHNwYW5uZXIgaGFzIG5vdyBiZWVuIG1vdmVkIG91dCBm cm9tIHRoZSBmbG93IHRocmVhZCwgYnV0IHdlIGRvbid0IHdhbnQgdG8KQEAgLTMzNSw3ICszMzUs NyBAQCBSZW5kZXJPYmplY3QqIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bvc3NpYmxl U3Bhbm5lckRlc2NlbmRhbnQoUmVuZGVyT2JqZQogICAgIGF1dG8gbmV3U2V0ID0gY3JlYXRlUmVu ZGVyZXI8UmVuZGVyTXVsdGlDb2x1bW5TZXQ+KCp0aGlzLCBSZW5kZXJTdHlsZTo6Y3JlYXRlQW5v bnltb3VzU3R5bGVXaXRoRGlzcGxheShtdWx0aWNvbENvbnRhaW5lci0+c3R5bGUoKSwgQkxPQ0sp KTsKICAgICBuZXdTZXQtPmluaXRpYWxpemVTdHlsZSgpOwogICAgIGF1dG8mIHNldCA9ICpuZXdT ZXQ7Ci0gICAgbXVsdGljb2xDb250YWluZXItPlJlbmRlckJsb2NrOjphZGRDaGlsZCgqUmVuZGVy VHJlZUJ1aWxkZXI6OmN1cnJlbnQoKSwgV1RGTW92ZShuZXdTZXQpLCBpbnNlcnRCZWZvcmVNdWx0 aWNvbENoaWxkKTsKKyAgICBSZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpLT5pbnNlcnRDaGls ZFRvUmVuZGVyQmxvY2soKm11bHRpY29sQ29udGFpbmVyLCBXVEZNb3ZlKG5ld1NldCksIGluc2Vy dEJlZm9yZU11bHRpY29sQ2hpbGQpOwogICAgIGludmFsaWRhdGVGcmFnbWVudHMoKTsKIAogICAg IC8vIFdlIGNhbm5vdCBoYW5kbGUgaW1tZWRpYXRlIGNvbHVtbiBzZXQgc2libGluZ3MgYXQgdGhl IG1vbWVudCAoYW5kIHRoZXJlJ3Mgbm8gbmVlZCBmb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5UnVuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSdWJ5UnVuLmNwcAppbmRleCBmMWIwMDI0ZWM1NDE1YmJiY2VmMDIzNTE4NDIxM2Yx ODdjNzA0ZjE5Li4yYzkwMTdhMzFhZWZjZjUzYTMxN2EyN2JlM2EyOTI3MWJkNmM2MTJjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCkBAIC05Myw3ICs5Myw3 IEBAIFJlbmRlclJ1YnlCYXNlKiBSZW5kZXJSdWJ5UnVuOjpydWJ5QmFzZVNhZmUoKQogICAgIGlm ICghYmFzZSkgewogICAgICAgICBhdXRvIG5ld0Jhc2UgPSBjcmVhdGVSdWJ5QmFzZSgpOwogICAg ICAgICBiYXNlID0gbmV3QmFzZS5nZXQoKTsKLSAgICAgICAgUmVuZGVyQmxvY2tGbG93OjphZGRD aGlsZCgqUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKSwgV1RGTW92ZShuZXdCYXNlKSk7Cisg ICAgICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPmluc2VydENoaWxkVG9SZW5kZXJC bG9ja0Zsb3coKnRoaXMsIFdURk1vdmUobmV3QmFzZSkpOwogICAgIH0KICAgICByZXR1cm4gYmFz ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDAxOTFhYzQ2YThhMjMx MWRjYTg0NjdmOTgzNDAzOWVhZDNlODc4NDYuLjQ1MDJjMGZlZWRlNDdkMGNhZDRmNDllNDhkZjI3 OTVkZjZlNjI2NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2tGbG93LmNwcApAQCAtNDIsNyAr NDIsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpCbG9ja0Zsb3c6Omluc2VydENoaWxkKFJl bmRlckJsb2NrRmxvdyYgcGFyZW50LCBSZW5kZXJQdAogICAgIGF1dG8qIGJlZm9yZUNoaWxkT3JQ bGFjZWhvbGRlciA9IGJlZm9yZUNoaWxkOwogICAgIGlmIChhdXRvKiBjb250YWluaW5nRnJhZ21l bnRlZEZsb3cgPSBwYXJlbnQuZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKSkKICAgICAgICAgYmVm b3JlQ2hpbGRPclBsYWNlaG9sZGVyID0gY29udGFpbmluZ0ZyYWdtZW50ZWRGbG93LT5yZXNvbHZl TW92ZWRDaGlsZChiZWZvcmVDaGlsZCk7Ci0gICAgcGFyZW50LlJlbmRlckJsb2NrOjphZGRDaGls ZChtX2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZE9yUGxhY2Vob2xkZXIpOwor ICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyQmxvY2socGFyZW50LCBXVEZNb3ZlKGNo aWxkKSwgYmVmb3JlQ2hpbGRPclBsYWNlaG9sZGVyKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1 bW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWls ZGVyTXVsdGlDb2x1bW4uY3BwCmluZGV4IDE4NTM5YWVlNDMxNmQzYjg5YjFkMDI2NDNmYmE4NTdl MThjYjY4YWUuLjQzN2I4Njc1OGU5MTg0MWIzMTg0ZGIzOThlYWQyNDNkNDJkODAxNjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRl ck11bHRpQ29sdW1uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHAKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBS ZW5kZXJUcmVlQnVpbGRlcjo6TXVsdGlDb2x1bW46OmNyZWF0ZUZyYWdtZW50ZWRGbG93KFJlbmRl ckJsb2NrRmxvdyYgZmxvdykKICAgICBhdXRvIG5ld0ZyYWdtZW50ZWRGbG93ID0gV2ViQ29yZTo6 Y3JlYXRlUmVuZGVyZXI8UmVuZGVyTXVsdGlDb2x1bW5GbG93PihmbG93LmRvY3VtZW50KCksIFJl bmRlclN0eWxlOjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KGZsb3cuc3R5bGUoKSwg QkxPQ0spKTsKICAgICBuZXdGcmFnbWVudGVkRmxvdy0+aW5pdGlhbGl6ZVN0eWxlKCk7CiAgICAg YXV0byYgZnJhZ21lbnRlZEZsb3cgPSAqbmV3RnJhZ21lbnRlZEZsb3c7Ci0gICAgZmxvdy5SZW5k ZXJCbG9jazo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKG5ld0ZyYWdtZW50ZWRGbG93KSk7 CisgICAgbV9idWlsZGVyLmluc2VydENoaWxkVG9SZW5kZXJCbG9jayhmbG93LCBXVEZNb3ZlKG5l d0ZyYWdtZW50ZWRGbG93KSk7CiAKICAgICAvLyBSZXBhcmVudCBjaGlsZHJlbiBwcmVjZWRpbmcg dGhlIGZyYWdtZW50ZWQgZmxvdyBpbnRvIHRoZSBmcmFnbWVudGVkIGZsb3cuCiAgICAgZmxvdy5t b3ZlQ2hpbGRyZW5UbygmZnJhZ21lbnRlZEZsb3csIGZsb3cuZmlyc3RDaGlsZCgpLCAmZnJhZ21l bnRlZEZsb3csIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlckluc2VydGlvbjo6 WWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlclJ1YnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAKaW5kZXggZWY2OGZhNTZlN2NlZDQ1ZmY0M2NhMzM0 Y2I0NDEzZjMwZmQzOTJmZS4uYTc4NjUxMDc0N2I2OGE0NWI2MDE3NmE0YTA3NzgwYjIyMjRkMTEz NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyUnVieS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBSZW5kZXJFbGVt ZW50JiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6ZmluZE9yQ3JlYXRlUGFyZW50Rm9yQ2hpbGQo UmVuZGVyUnVieUFzSQogICAgICAgICBpZiAoIWJlZm9yZUJsb2NrKSB7CiAgICAgICAgICAgICBh dXRvIG5ld0Jsb2NrID0gY3JlYXRlQW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAg ICAgICAgICAgICBiZWZvcmVCbG9jayA9IG5ld0Jsb2NrLmdldCgpOwotICAgICAgICAgICAgcGFy ZW50LlJlbmRlcklubGluZTo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKG5ld0Jsb2NrKSwg cGFyZW50LmZpcnN0Q2hpbGQoKSk7CisgICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRU b1JlbmRlcklubGluZShwYXJlbnQsIFdURk1vdmUobmV3QmxvY2spLCBwYXJlbnQuZmlyc3RDaGls ZCgpKTsKICAgICAgICAgfQogICAgICAgICBiZWZvcmVDaGlsZCA9IG51bGxwdHI7CiAgICAgICAg IHJldHVybiAqYmVmb3JlQmxvY2s7CkBAIC0yNDcsNyArMjQ3LDcgQEAgUmVuZGVyRWxlbWVudCYg UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRl clJ1YnlBc0kKICAgICAgICAgaWYgKCFhZnRlckJsb2NrKSB7CiAgICAgICAgICAgICBhdXRvIG5l d0Jsb2NrID0gY3JlYXRlQW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAgICAgICAg ICAgICBhZnRlckJsb2NrID0gbmV3QmxvY2suZ2V0KCk7Ci0gICAgICAgICAgICBwYXJlbnQuUmVu ZGVySW5saW5lOjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUobmV3QmxvY2spKTsKKyAgICAg ICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92 ZShuZXdCbG9jaykpOwogICAgICAgICB9CiAgICAgICAgIGJlZm9yZUNoaWxkID0gbnVsbHB0cjsK ICAgICAgICAgcmV0dXJuICphZnRlckJsb2NrOwpAQCAtMjc2LDcgKzI3Niw3IEBAIFJlbmRlckVs ZW1lbnQmIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGls ZChSZW5kZXJSdWJ5QXNJCiAgICAgaWYgKCFsYXN0UnVuIHx8IGxhc3RSdW4tPmhhc1J1YnlUZXh0 KCkpIHsKICAgICAgICAgYXV0byBuZXdSdW4gPSBSZW5kZXJSdWJ5UnVuOjpzdGF0aWNDcmVhdGVS dWJ5UnVuKCZwYXJlbnQpOwogICAgICAgICBsYXN0UnVuID0gbmV3UnVuLmdldCgpOwotICAgICAg ICBwYXJlbnQuUmVuZGVySW5saW5lOjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUobmV3UnVu KSwgYmVmb3JlQ2hpbGQpOworICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlcklu bGluZShwYXJlbnQsIFdURk1vdmUobmV3UnVuKSwgYmVmb3JlQ2hpbGQpOwogICAgIH0KICAgICBi ZWZvcmVDaGlsZCA9IG51bGxwdHI7CiAgICAgcmV0dXJuICpsYXN0UnVuOwo= 330790 2018-01-08 20:59:25 -0800 2018-01-09 07:22:17 -0800 Patch bug-181407-20180108205925.patch text/plain 8648 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0NWY5M2RiOTEwYjY3 MzUxNzgxMDQzZWI1MGUyMWQ5YzQyNDFkZS4uZjliMGFhN2EwMjFjMTM1ZTg2NWU4MmQ2ODU3MmFj Mzk1ZDJkZmJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAxLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBUcmFuc2l0aW9uIFJlbmRlcio6OmFkZENoaWxkKCkgY2FsbHMgdG8gUmVuZGVyVHJlZUJ1aWxk ZXI6Omluc2VydENoaWxkVG9SZW5kZXIqKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4MTQwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYzNjEx NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXZl bnR1YWxseSBhbGwgbXV0YXRpb24gd2lsbCBiZSBnb2luZyB0aHJvdWdoIHRoZSBSZW5kZXJUcmVl QnVpbGRlci4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy aWQ6OmFkZENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bv c3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSdWJ5 UnVuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJ1YnlSdW46OnJ1YnlCYXNlU2FmZSk6 CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2tGbG93 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpCbG9ja0Zsb3c6Omlu c2VydENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJNdWx0aUNvbHVtbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6 TXVsdGlDb2x1bW46OmNyZWF0ZUZyYWdtZW50ZWRGbG93KToKKyAgICAgICAgKiByZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZCk6CisKIDIw MTgtMDEtMDggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgW0F0dGFjaG1lbnQgU3VwcG9ydF0gRXhwb3NlIEhUTUxBdHRhY2htZW50RWxlbWVudC51bmlx dWVJZGVudGlmaWVyIHRvIGJpbmRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5jcHAKaW5kZXggNzc2NTQyMGY3NGZlMGU4Y2RkZDZhNjE2NGFjNjJkYmVmNWE3NDU0OC4uZjlk YWU4YzdlMTc5MmFkNGJiZWNhZWFiNDAyZmE2MmZjMDc4NjdkZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkxheW91 dFN0YXRlLmgiCiAjaW5jbHVkZSAiUmVuZGVyQ2hpbGRJdGVyYXRvci5oIgogI2luY2x1ZGUgIlJl bmRlckxheWVyLmgiCisjaW5jbHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJS ZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSA8Y3N0ZGxpYj4KICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9j SW5saW5lcy5oPgpAQCAtNzIsNyArNzMsNyBAQCBSZW5kZXJHcmlkOjp+UmVuZGVyR3JpZCgpID0g ZGVmYXVsdDsKIHZvaWQgUmVuZGVyR3JpZDo6YWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1 aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJl Zm9yZUNoaWxkKQogewogICAgIGF1dG8mIGNoaWxkID0gKm5ld0NoaWxkOwotICAgIFJlbmRlckJs b2NrOjphZGRDaGlsZChidWlsZGVyLCBXVEZNb3ZlKG5ld0NoaWxkKSwgYmVmb3JlQ2hpbGQpOwor ICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrKCp0aGlzLCBXVEZNb3ZlKG5ld0No aWxkKSwgYmVmb3JlQ2hpbGQpOwogCiAgICAgLy8gUG9zaXRpb25lZCBncmlkIGl0ZW1zIGRvIG5v dCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lzZSBwYXJ0aWNpcGF0ZSBpbiB0aGUgbGF5b3V0IG9m IHRoZSBncmlkLAogICAgIC8vIGZvciB0aGF0IHJlYXNvbiB3ZSBkb24ndCBuZWVkIHRvIG1hcmsg dGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5IGFyZSBhZGRlZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKaW5kZXggYzI3NDgxMjE0 NzZiNzIxNmJjMzcyMzg2ZDFlYmExNWZmNjIwNTcxZS4uMTdmZmVkNWRjYWI0NmU2NmRmYWY1NDc3 NTIyZTBjMmUyODU5NmMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvdy5jcHAKQEAgLTI5OCw3ICsyOTgsNyBAQCBSZW5kZXJPYmplY3Qq IFJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bvc3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQo UmVuZGVyT2JqZQogICAgICAgICAKICAgICAgICAgLy8gVGhpcyBpcyBhIGd1YXJkIHRvIHN0b3Ag YW4gYW5jZXN0b3IgZmxvdyB0aHJlYWQgZnJvbSBwcm9jZXNzaW5nIHRoZSBzcGFubmVyLgogICAg ICAgICBnU2hpZnRpbmdTcGFubmVyID0gdHJ1ZTsKLSAgICAgICAgbXVsdGljb2xDb250YWluZXIt PlJlbmRlckJsb2NrOjphZGRDaGlsZCgqUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKSwgV1RG TW92ZSh0YWtlbkRlc2NlbmRhbnQpLCBpbnNlcnRCZWZvcmVNdWx0aWNvbENoaWxkKTsKKyAgICAg ICAgUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKS0+aW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2Nr KCptdWx0aWNvbENvbnRhaW5lciwgV1RGTW92ZSh0YWtlbkRlc2NlbmRhbnQpLCBpbnNlcnRCZWZv cmVNdWx0aWNvbENoaWxkKTsKICAgICAgICAgZ1NoaWZ0aW5nU3Bhbm5lciA9IGZhbHNlOwogICAg ICAgICAKICAgICAgICAgLy8gVGhlIHNwYW5uZXIgaGFzIG5vdyBiZWVuIG1vdmVkIG91dCBmcm9t IHRoZSBmbG93IHRocmVhZCwgYnV0IHdlIGRvbid0IHdhbnQgdG8KQEAgLTMzNSw3ICszMzUsNyBA QCBSZW5kZXJPYmplY3QqIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6cHJvY2Vzc1Bvc3NpYmxlU3Bh bm5lckRlc2NlbmRhbnQoUmVuZGVyT2JqZQogICAgIGF1dG8gbmV3U2V0ID0gY3JlYXRlUmVuZGVy ZXI8UmVuZGVyTXVsdGlDb2x1bW5TZXQ+KCp0aGlzLCBSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnlt b3VzU3R5bGVXaXRoRGlzcGxheShtdWx0aWNvbENvbnRhaW5lci0+c3R5bGUoKSwgQkxPQ0spKTsK ICAgICBuZXdTZXQtPmluaXRpYWxpemVTdHlsZSgpOwogICAgIGF1dG8mIHNldCA9ICpuZXdTZXQ7 Ci0gICAgbXVsdGljb2xDb250YWluZXItPlJlbmRlckJsb2NrOjphZGRDaGlsZCgqUmVuZGVyVHJl ZUJ1aWxkZXI6OmN1cnJlbnQoKSwgV1RGTW92ZShuZXdTZXQpLCBpbnNlcnRCZWZvcmVNdWx0aWNv bENoaWxkKTsKKyAgICBSZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpLT5pbnNlcnRDaGlsZFRv UmVuZGVyQmxvY2soKm11bHRpY29sQ29udGFpbmVyLCBXVEZNb3ZlKG5ld1NldCksIGluc2VydEJl Zm9yZU11bHRpY29sQ2hpbGQpOwogICAgIGludmFsaWRhdGVGcmFnbWVudHMoKTsKIAogICAgIC8v IFdlIGNhbm5vdCBoYW5kbGUgaW1tZWRpYXRlIGNvbHVtbiBzZXQgc2libGluZ3MgYXQgdGhlIG1v bWVudCAoYW5kIHRoZXJlJ3Mgbm8gbmVlZCBmb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJSdWJ5UnVuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSdWJ5UnVuLmNwcAppbmRleCBmMWIwMDI0ZWM1NDE1YmJiY2VmMDIzNTE4NDIxM2YxODdj NzA0ZjE5Li4yYzkwMTdhMzFhZWZjZjUzYTMxN2EyN2JlM2EyOTI3MWJkNmM2MTJjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCkBAIC05Myw3ICs5Myw3IEBA IFJlbmRlclJ1YnlCYXNlKiBSZW5kZXJSdWJ5UnVuOjpydWJ5QmFzZVNhZmUoKQogICAgIGlmICgh YmFzZSkgewogICAgICAgICBhdXRvIG5ld0Jhc2UgPSBjcmVhdGVSdWJ5QmFzZSgpOwogICAgICAg ICBiYXNlID0gbmV3QmFzZS5nZXQoKTsKLSAgICAgICAgUmVuZGVyQmxvY2tGbG93OjphZGRDaGls ZCgqUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKSwgV1RGTW92ZShuZXdCYXNlKSk7CisgICAg ICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPmluc2VydENoaWxkVG9SZW5kZXJCbG9j a0Zsb3coKnRoaXMsIFdURk1vdmUobmV3QmFzZSkpOwogICAgIH0KICAgICByZXR1cm4gYmFzZTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDAxOTFhYzQ2YThhMjMxMWRj YTg0NjdmOTgzNDAzOWVhZDNlODc4NDYuLjQ1MDJjMGZlZWRlNDdkMGNhZDRmNDllNDhkZjI3OTVk ZjZlNjI2NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2tGbG93LmNwcApAQCAtNDIsNyArNDIs NyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpCbG9ja0Zsb3c6Omluc2VydENoaWxkKFJlbmRl ckJsb2NrRmxvdyYgcGFyZW50LCBSZW5kZXJQdAogICAgIGF1dG8qIGJlZm9yZUNoaWxkT3JQbGFj ZWhvbGRlciA9IGJlZm9yZUNoaWxkOwogICAgIGlmIChhdXRvKiBjb250YWluaW5nRnJhZ21lbnRl ZEZsb3cgPSBwYXJlbnQuZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKSkKICAgICAgICAgYmVmb3Jl Q2hpbGRPclBsYWNlaG9sZGVyID0gY29udGFpbmluZ0ZyYWdtZW50ZWRGbG93LT5yZXNvbHZlTW92 ZWRDaGlsZChiZWZvcmVDaGlsZCk7Ci0gICAgcGFyZW50LlJlbmRlckJsb2NrOjphZGRDaGlsZCht X2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZE9yUGxhY2Vob2xkZXIpOworICAg IG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyQmxvY2socGFyZW50LCBXVEZNb3ZlKGNoaWxk KSwgYmVmb3JlQ2hpbGRPclBsYWNlaG9sZGVyKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4u Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy TXVsdGlDb2x1bW4uY3BwCmluZGV4IDE4NTM5YWVlNDMxNmQzYjg5YjFkMDI2NDNmYmE4NTdlMThj YjY4YWUuLjQzN2I4Njc1OGU5MTg0MWIzMTg0ZGIzOThlYWQyNDNkNDJkODAxNjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11 bHRpQ29sdW1uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHAKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBSZW5k ZXJUcmVlQnVpbGRlcjo6TXVsdGlDb2x1bW46OmNyZWF0ZUZyYWdtZW50ZWRGbG93KFJlbmRlckJs b2NrRmxvdyYgZmxvdykKICAgICBhdXRvIG5ld0ZyYWdtZW50ZWRGbG93ID0gV2ViQ29yZTo6Y3Jl YXRlUmVuZGVyZXI8UmVuZGVyTXVsdGlDb2x1bW5GbG93PihmbG93LmRvY3VtZW50KCksIFJlbmRl clN0eWxlOjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KGZsb3cuc3R5bGUoKSwgQkxP Q0spKTsKICAgICBuZXdGcmFnbWVudGVkRmxvdy0+aW5pdGlhbGl6ZVN0eWxlKCk7CiAgICAgYXV0 byYgZnJhZ21lbnRlZEZsb3cgPSAqbmV3RnJhZ21lbnRlZEZsb3c7Ci0gICAgZmxvdy5SZW5kZXJC bG9jazo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKG5ld0ZyYWdtZW50ZWRGbG93KSk7Cisg ICAgbV9idWlsZGVyLmluc2VydENoaWxkVG9SZW5kZXJCbG9jayhmbG93LCBXVEZNb3ZlKG5ld0Zy YWdtZW50ZWRGbG93KSk7CiAKICAgICAvLyBSZXBhcmVudCBjaGlsZHJlbiBwcmVjZWRpbmcgdGhl IGZyYWdtZW50ZWQgZmxvdyBpbnRvIHRoZSBmcmFnbWVudGVkIGZsb3cuCiAgICAgZmxvdy5tb3Zl Q2hpbGRyZW5UbygmZnJhZ21lbnRlZEZsb3csIGZsb3cuZmlyc3RDaGlsZCgpLCAmZnJhZ21lbnRl ZEZsb3csIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlckluc2VydGlvbjo6WWVz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlclJ1YnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyUnVieS5jcHAKaW5kZXggZWY2OGZhNTZlN2NlZDQ1ZmY0M2NhMzM0Y2I0 NDEzZjMwZmQzOTJmZS4uYTc4NjUxMDc0N2I2OGE0NWI2MDE3NmE0YTA3NzgwYjIyMjRkMTEzNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVC dWlsZGVyUnVieS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyUnVieS5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBSZW5kZXJFbGVtZW50 JiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6ZmluZE9yQ3JlYXRlUGFyZW50Rm9yQ2hpbGQoUmVu ZGVyUnVieUFzSQogICAgICAgICBpZiAoIWJlZm9yZUJsb2NrKSB7CiAgICAgICAgICAgICBhdXRv IG5ld0Jsb2NrID0gY3JlYXRlQW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAgICAg ICAgICAgICBiZWZvcmVCbG9jayA9IG5ld0Jsb2NrLmdldCgpOwotICAgICAgICAgICAgcGFyZW50 LlJlbmRlcklubGluZTo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKG5ld0Jsb2NrKSwgcGFy ZW50LmZpcnN0Q2hpbGQoKSk7CisgICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1Jl bmRlcklubGluZShwYXJlbnQsIFdURk1vdmUobmV3QmxvY2spLCBwYXJlbnQuZmlyc3RDaGlsZCgp KTsKICAgICAgICAgfQogICAgICAgICBiZWZvcmVDaGlsZCA9IG51bGxwdHI7CiAgICAgICAgIHJl dHVybiAqYmVmb3JlQmxvY2s7CkBAIC0yNDcsNyArMjQ3LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVu ZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1 YnlBc0kKICAgICAgICAgaWYgKCFhZnRlckJsb2NrKSB7CiAgICAgICAgICAgICBhdXRvIG5ld0Js b2NrID0gY3JlYXRlQW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAgICAgICAgICAg ICBhZnRlckJsb2NrID0gbmV3QmxvY2suZ2V0KCk7Ci0gICAgICAgICAgICBwYXJlbnQuUmVuZGVy SW5saW5lOjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUobmV3QmxvY2spKTsKKyAgICAgICAg ICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92ZShu ZXdCbG9jaykpOwogICAgICAgICB9CiAgICAgICAgIGJlZm9yZUNoaWxkID0gbnVsbHB0cjsKICAg ICAgICAgcmV0dXJuICphZnRlckJsb2NrOwpAQCAtMjc2LDcgKzI3Niw3IEBAIFJlbmRlckVsZW1l bnQmIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChS ZW5kZXJSdWJ5QXNJCiAgICAgaWYgKCFsYXN0UnVuIHx8IGxhc3RSdW4tPmhhc1J1YnlUZXh0KCkp IHsKICAgICAgICAgYXV0byBuZXdSdW4gPSBSZW5kZXJSdWJ5UnVuOjpzdGF0aWNDcmVhdGVSdWJ5 UnVuKCZwYXJlbnQpOwogICAgICAgICBsYXN0UnVuID0gbmV3UnVuLmdldCgpOwotICAgICAgICBw YXJlbnQuUmVuZGVySW5saW5lOjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUobmV3UnVuKSwg YmVmb3JlQ2hpbGQpOworICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlcklubGlu ZShwYXJlbnQsIFdURk1vdmUobmV3UnVuKSwgYmVmb3JlQ2hpbGQpOwogICAgIH0KICAgICBiZWZv cmVDaGlsZCA9IG51bGxwdHI7CiAgICAgcmV0dXJuICpsYXN0UnVuOwo=