182934 2018-02-19 11:14:37 -0800 [RenderTreeBuilder] Rename RenderTreeBuilder::removeAndDestroyChild() -> removeAndDestroy() 2018-02-19 11:55:12 -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 1400434 0 zalan 2018-02-19 11:14:37 -0800 ssia 1400435 1 webkit-bug-importer 2018-02-19 11:15:08 -0800 <rdar://problem/37678241> 1400436 2 334168 zalan 2018-02-19 11:16:22 -0800 Created attachment 334168 Patch 1400447 3 334168 commit-queue 2018-02-19 11:55:10 -0800 Comment on attachment 334168 Patch Clearing flags on attachment: 334168 Committed r228704: <https://trac.webkit.org/changeset/228704> 1400448 4 commit-queue 2018-02-19 11:55:12 -0800 All reviewed patches have been landed. Closing bug. 334168 2018-02-19 11:16:22 -0800 2018-02-19 11:55:10 -0800 Patch bug-182934-20180219111621.patch text/plain 18768 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNkMzg2ZDIwYzQyODk0 ODQxZDEzYzIyMzBkMmZiY2QwYWRhZmI2Ny4uODhkMzJiZjIxYjE1NjRjNWRhZDdjYTE3ZGRiYzY1 NzA2YTI1OGQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE4LTAyLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBSZW5hbWUgUmVuZGVyVHJlZUJ1aWxkZXI6OnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgpIC0+IHJl bW92ZUFuZERlc3Ryb3koKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTgyOTM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzY3ODI0MT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4g ZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudDo6c2V0RnVsbFNjcmVlblJlbmRlcmVyKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94TW9kZWxPYmplY3Q6OnJlbW92ZUFuZERlc3Ryb3lBbGxDb250aW51YXRpb25zKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJ1dHRvbjo6c2V0VGV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnVsbFNjcmVlbjo6d2lsbEJlRGVzdHJveWVk KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZ1bGxTY3JlZW46OnVud3JhcFJlbmRlcmVyKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGlzdEl0ZW06OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRGcmFnbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0RnJh Z21lbnQ6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0RnJh Z21lbnQ6OnNldFRleHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgICog cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRyZWVCdWlsZGVyOjpyZW1vdmVBbmREZXN0cm95KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRyZWVCdWlsZGVyOjpyZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveUNsZWFuaW5n VXBBbm9ueW1vdXNXcmFwcGVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRl cjo6cmVtb3ZlQW5kRGVzdHJveUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU cmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyRmlyc3RMZXR0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVHJlZUJ1aWxkZXI6OkZpcnN0TGV0dGVyOjp1cGRhdGVTdHlsZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6Rmlyc3RMZXR0ZXI6OmNyZWF0ZVJlbmRlcmVycyk6 CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTGlzdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6TGlzdDo6dXBkYXRlSXRlbU1h cmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVs dGlDb2x1bW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRp Q29sdW1uOjpkZXN0cm95RnJhZ21lbnRlZEZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpoYW5kbGVTcGFubmVyUmVtb3ZhbCk6CisgICAgICAg ICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6bW92ZUJsb2NrQ2hpbGRyZW4pOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OnRha2VDaGlsZCk6CisK IDIwMTgtMDItMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb UmVuZGVyVHJlZUJ1aWxkZXJdIFJlbW92ZSByZWR1bmRhbnQgUmVuZGVyT2JqZWN0OjpyZW1vdmVG cm9tUGFyZW50QW5kRGVzdHJveQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggYTVjODRmYWZl ZDFiNTk0MTE1MzQ4OGRmMzY1NmM2NzVjNjZhMDYxNi4uZjQ0ZDQ4MGM0MjIzZDQyYWQ4OTg4Nzcw ZmZiZDRhYzhlODIxYzE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC02MzE1LDcgKzYz MTUsNyBAQCB2b2lkIERvY3VtZW50OjpzZXRGdWxsU2NyZWVuUmVuZGVyZXIoUmVuZGVyVHJlZUJ1 aWxkZXImIGJ1aWxkZXIsIFJlbmRlckZ1bGxTY3JlZQogICAgIH0KIAogICAgIGlmIChtX2Z1bGxT Y3JlZW5SZW5kZXJlcikKLSAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm1f ZnVsbFNjcmVlblJlbmRlcmVyKTsKKyAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95KCpt X2Z1bGxTY3JlZW5SZW5kZXJlcik7CiAgICAgQVNTRVJUKCFtX2Z1bGxTY3JlZW5SZW5kZXJlcik7 CiAKICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlciA9IG1ha2VXZWFrUHRyKHJlbmRlcmVyKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCmlu ZGV4IDM3NjI5NTA2YjRhN2FiYWVkNDU2OTdkYTEwZDNiYWIwYTUxNTJlOWUuLjZjMjIzZWUxMGY0 MTU5YTgyZjc5OTMwMzk3ODMwOTNjN2JhZTYxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMjU1OCw3ICsyNTU4LDcgQEAg dm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVtb3ZlQW5kRGVzdHJveUFsbENvbnRpbnVhdGlv bnMoUmVuZGVyVHJlZUJ1aWxkZXImIGIKICAgICBBU1NFUlQoY29udGludWF0aW9uQ2hhaW5Ob2Rl TWFwKCkuY29udGFpbnModGhpcykpOwogICAgIGF1dG8mIGNvbnRpbnVhdGlvbkNoYWluTm9kZSA9 ICpjb250aW51YXRpb25DaGFpbk5vZGVNYXAoKS5nZXQodGhpcyk7CiAgICAgd2hpbGUgKGNvbnRp bnVhdGlvbkNoYWluTm9kZS5uZXh0KQotICAgICAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lD aGlsZCgqY29udGludWF0aW9uQ2hhaW5Ob2RlLm5leHQtPnJlbmRlcmVyKTsKKyAgICAgICAgYnVp bGRlci5yZW1vdmVBbmREZXN0cm95KCpjb250aW51YXRpb25DaGFpbk5vZGUubmV4dC0+cmVuZGVy ZXIpOwogICAgIHJlbW92ZUZyb21Db250aW51YXRpb25DaGFpbigpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCmluZGV4IDQ2YjljN2M3NmM3MjU3MGIyNTc2 ZDk0NTEwZjAwMjA5NjRiMzcwMTMuLjY5NWYwYzkyMjI5YmIzMjM2NjljNzk0YWRkZGE4Nzk4NzY0 ZjNmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCkBAIC0x MTcsOSArMTE3LDkgQEAgdm9pZCBSZW5kZXJCdXR0b246OnNldFRleHQoY29uc3QgU3RyaW5nJiBz dHIpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKFJlbmRlclRyZWVCdWlsZGVyOjpj dXJyZW50KCkpCi0gICAgICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPnJlbW92ZUFu ZERlc3Ryb3lDaGlsZCgqbV9idXR0b25UZXh0KTsKKyAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6 OmN1cnJlbnQoKS0+cmVtb3ZlQW5kRGVzdHJveSgqbV9idXR0b25UZXh0KTsKICAgICBlbHNlCi0g ICAgICAgIFJlbmRlclRyZWVCdWlsZGVyKCpkb2N1bWVudCgpLnJlbmRlclZpZXcoKSkucmVtb3Zl QW5kRGVzdHJveUNoaWxkKCptX2J1dHRvblRleHQpOworICAgICAgICBSZW5kZXJUcmVlQnVpbGRl cigqZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkpLnJlbW92ZUFuZERlc3Ryb3koKm1fYnV0dG9uVGV4 dCk7CiB9CiAKIFN0cmluZyBSZW5kZXJCdXR0b246OnRleHQoKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uY3BwCmluZGV4IDE1YmI5YTk2NjUzNWJh MDdjYjc2OGRkMjg5NmE2Njk4NzVkODllYTEuLmEzYWJiN2UxOTE4NWQ1Y2YxZWY4NzZlZTg4ODY1 OTZmMzBmZjc5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG dWxsU2NyZWVuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNj cmVlbi5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgUmVuZGVyRnVsbFNjcmVlbjo6UmVuZGVyRnVsbFNj cmVlbihEb2N1bWVudCYgZG9jdW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUpCiB2b2lkIFJlbmRl ckZ1bGxTY3JlZW46OndpbGxCZURlc3Ryb3llZChSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikK IHsKICAgICBpZiAobV9wbGFjZWhvbGRlcikgewotICAgICAgICBidWlsZGVyLnJlbW92ZUFuZERl c3Ryb3lDaGlsZCgqbV9wbGFjZWhvbGRlcik7CisgICAgICAgIGJ1aWxkZXIucmVtb3ZlQW5kRGVz dHJveSgqbV9wbGFjZWhvbGRlcik7CiAgICAgICAgIEFTU0VSVCghbV9wbGFjZWhvbGRlcik7CiAg ICAgfQogCkBAIC0xNjksNyArMTY5LDcgQEAgdm9pZCBSZW5kZXJGdWxsU2NyZWVuOjp1bndyYXBS ZW5kZXJlcihib29sJiByZXF1aXJlc1JlbmRlclRyZWVSZWJ1aWxkKQogICAgICAgICAgICAgICAg IGlmIChhdXRvKiBub25Bbm9ueW1vdXNDaGlsZCA9IGRvd25jYXN0PFJlbmRlckJsb2NrPigqY2hp bGQpLmZpcnN0Q2hpbGQoKSkKICAgICAgICAgICAgICAgICAgICAgY2hpbGQgPSBub25Bbm9ueW1v dXNDaGlsZDsKICAgICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgYnVp bGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKmNoaWxkKTsKKyAgICAgICAgICAgICAgICAgICAg YnVpbGRlci5yZW1vdmVBbmREZXN0cm95KCpjaGlsZCk7CiAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTE4NCwxMCArMTg0 LDEwIEBAIHZvaWQgUmVuZGVyRnVsbFNjcmVlbjo6dW53cmFwUmVuZGVyZXIoYm9vbCYgcmVxdWly ZXNSZW5kZXJUcmVlUmVidWlsZCkKICAgICAgICAgfQogICAgIH0KICAgICBpZiAocGxhY2Vob2xk ZXIoKSkKLSAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKnBsYWNlaG9sZGVy KCkpOworICAgICAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ryb3koKnBsYWNlaG9sZGVyKCkpOwog ICAgIEFTU0VSVCghcGxhY2Vob2xkZXIoKSk7CiAKLSAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ry b3lDaGlsZCgqdGhpcyk7CisgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95KCp0aGlzKTsKIH0K IAogdm9pZCBSZW5kZXJGdWxsU2NyZWVuOjpjcmVhdGVQbGFjZWhvbGRlcihzdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IHN0eWxlLCBjb25zdCBMYXlvdXRSZWN0JiBmcmFtZVJlY3QpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcAppbmRleCBiZTY5M2NiNGFl ZTk2ZTY4MDdkOTliOWFlYjYwZGY2MTViOWRmYTVkLi4zNDIwOGQ4NWMxN2E5MzI4ZjQyYzUxMDc3 YmZkZmVlZWIyOTJlNTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGlzdEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 SXRlbS5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgUmVuZGVyTGlzdEl0ZW06On5SZW5kZXJMaXN0SXRl bSgpCiB2b2lkIFJlbmRlckxpc3RJdGVtOjp3aWxsQmVEZXN0cm95ZWQoUmVuZGVyVHJlZUJ1aWxk ZXImIGJ1aWxkZXIpCiB7CiAgICAgaWYgKG1fbWFya2VyKQotICAgICAgICBidWlsZGVyLnJlbW92 ZUFuZERlc3Ryb3lDaGlsZCgqbV9tYXJrZXIpOworICAgICAgICBidWlsZGVyLnJlbW92ZUFuZERl c3Ryb3koKm1fbWFya2VyKTsKICAgICBSZW5kZXJCbG9ja0Zsb3c6OndpbGxCZURlc3Ryb3llZChi dWlsZGVyKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHRGcmFnbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dEZy YWdtZW50LmNwcAppbmRleCAxMGQ1MTVkMmU0ZjBlMjRiNzEzNDgzYzM5ZjFmZmE3OTFhZTJlYzAz Li4yNzVkODFiYTM5MmFmNzZlZWVkY2M3OTZmNzgxZTdlMWY3MGY2YTQxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmNwcApAQCAtNzcsNyArNzcs NyBAQCB2b2lkIFJlbmRlclRleHRGcmFnbWVudDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJl bmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKgogdm9pZCBSZW5kZXJUZXh0RnJhZ21lbnQ6Ondp bGxCZURlc3Ryb3llZChSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKIHsKICAgICBpZiAobV9m aXJzdExldHRlcikKLSAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm1fZmly c3RMZXR0ZXIpOworICAgICAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ryb3koKm1fZmlyc3RMZXR0 ZXIpOwogICAgIFJlbmRlclRleHQ6OndpbGxCZURlc3Ryb3llZChidWlsZGVyKTsKIH0KIApAQCAt ODksOSArODksOSBAQCB2b2lkIFJlbmRlclRleHRGcmFnbWVudDo6c2V0VGV4dChjb25zdCBTdHJp bmcmIG5ld1RleHQsIGJvb2wgZm9yY2UpCiAgICAgaWYgKCFtX2ZpcnN0TGV0dGVyKQogICAgICAg ICByZXR1cm47CiAgICAgaWYgKFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCkpCi0gICAgICAg IFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqbV9m aXJzdExldHRlcik7CisgICAgICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPnJlbW92 ZUFuZERlc3Ryb3koKm1fZmlyc3RMZXR0ZXIpOwogICAgIGVsc2UKLSAgICAgICAgUmVuZGVyVHJl ZUJ1aWxkZXIoKmRvY3VtZW50KCkucmVuZGVyVmlldygpKS5yZW1vdmVBbmREZXN0cm95Q2hpbGQo Km1fZmlyc3RMZXR0ZXIpOworICAgICAgICBSZW5kZXJUcmVlQnVpbGRlcigqZG9jdW1lbnQoKS5y ZW5kZXJWaWV3KCkpLnJlbW92ZUFuZERlc3Ryb3koKm1fZmlyc3RMZXR0ZXIpOwogICAgIEFTU0VS VCghbV9maXJzdExldHRlcik7CiAgICAgQVNTRVJUKCF0ZXh0Tm9kZSgpIHx8IHRleHROb2RlKCkt PnJlbmRlcmVyKCkgPT0gdGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmll dy5jcHAKaW5kZXggNDgxOTY4ZTRlNzZmY2MxNDYxYjFmYzg0YWYwMDcyODIyYzFjNzNiYS4uZTE5 ODEzMDFmNWU5YmM3ZTJlOGJhMmZkYmQ4OGRjYTBmZmI0NzQwMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtNjE2LDcgKzYxNiw3IEBAIHZvaWQgUmVuZGVyVmll dzo6d2lsbEJlRGVzdHJveWVkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyKQogICAgIFJlbmRl ckJsb2NrRmxvdzo6d2lsbEJlRGVzdHJveWVkKGJ1aWxkZXIpOwogICAgIC8vIEZJWE1FOiBUaGlz IGlzIGEgd29ya2Fyb3VuZCBmb3IgbGVmdG92ZXIgY29udGVudCAoc2VlIHdlYmtpdC5vcmcvYi8x ODI1NDcpLgogICAgIHdoaWxlIChmaXJzdENoaWxkKCkpCi0gICAgICAgIGJ1aWxkZXIucmVtb3Zl QW5kRGVzdHJveUNoaWxkKCpmaXJzdENoaWxkKCkpOworICAgICAgICBidWlsZGVyLnJlbW92ZUFu ZERlc3Ryb3koKmZpcnN0Q2hpbGQoKSk7CiAKICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKG1fcmVu ZGVyZXJDb3VudCA9PSAxLCAiQWxsIG90aGVyIHJlbmRlcmVycyBpbiB0aGlzIHJlbmRlciB0cmVl IHNob3VsZCBoYXZlIGJlZW4gZGVzdHJveWVkIik7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCA1ZTQ4 YzIyZDIxZGY0MjQwYjU1OTg2YjE5OGJjNmIxNTlhNGRkOTFjLi5iMTNkZDVlMmE2ZTUyMDQ1NTg4 NTk2YmViMjViYjIwYzViMzgzZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTEzOSw3ICsxMzksNyBA QCBSZW5kZXJUcmVlQnVpbGRlcjo6flJlbmRlclRyZWVCdWlsZGVyKCkKICAgICBzX2N1cnJlbnQg PSBtX3ByZXZpb3VzOwogfQogCi12b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpyZW1vdmVBbmREZXN0 cm95Q2hpbGQoUmVuZGVyT2JqZWN0JiBjaGlsZCkKK3ZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OnJl bW92ZUFuZERlc3Ryb3koUmVuZGVyT2JqZWN0JiBjaGlsZCkKIHsKICAgICBBU1NFUlQoY2hpbGQu cGFyZW50KCkpOwogICAgIGF1dG8gdG9EZXN0cm95ID0gdGFrZUNoaWxkKCpjaGlsZC5wYXJlbnQo KSwgY2hpbGQpOwpAQCAtMTU0LDcgKzE1NCw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OnJl bW92ZUFuZERlc3Ryb3lDaGlsZChSZW5kZXJPYmplY3QmIGNoaWxkKQogICAgICAgICBhdXRvJiBm aXJzdENoaWxkID0gKmNoaWxkVG9EZXN0cm95LmZpcnN0Q2hpbGQoKTsKICAgICAgICAgaWYgKGF1 dG8qIG5vZGUgPSBmaXJzdENoaWxkLm5vZGUoKSkKICAgICAgICAgICAgIG5vZGUtPnNldFJlbmRl cmVyKG51bGxwdHIpOwotICAgICAgICByZW1vdmVBbmREZXN0cm95Q2hpbGQoZmlyc3RDaGlsZCk7 CisgICAgICAgIHJlbW92ZUFuZERlc3Ryb3koZmlyc3RDaGlsZCk7CiAgICAgfQogfQogCkBAIC02 NDYsNyArNjQ2LDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6cmVtb3ZlRnJvbVBhcmVudEFu ZERlc3Ryb3lDbGVhbmluZ1VwQW5vbnltb3VzV3JhcHBlcnMoUmUKIHsKICAgICAvLyBJZiB0aGUg dHJlZSBpcyBkZXN0cm95ZWQsIHRoZXJlIGlzIG5vIG5lZWQgZm9yIGEgY2xlYW4tdXAgcGhhc2Uu CiAgICAgaWYgKGNoaWxkLnJlbmRlclRyZWVCZWluZ0Rlc3Ryb3llZCgpKSB7Ci0gICAgICAgIHJl bW92ZUFuZERlc3Ryb3lDaGlsZChjaGlsZCk7CisgICAgICAgIHJlbW92ZUFuZERlc3Ryb3koY2hp bGQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC02NTgsNyArNjU4LDcgQEAgdm9pZCBS ZW5kZXJUcmVlQnVpbGRlcjo6cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3lDbGVhbmluZ1VwQW5v bnltb3VzV3JhcHBlcnMoUmUKICAgICAgICAgdGFibGVCdWlsZGVyKCkuY29sbGFwc2VBbmREZXN0 cm95QW5vbnltb3VzU2libGluZ1Jvd3MoZG93bmNhc3Q8UmVuZGVyVGFibGVSb3c+KGRlc3Ryb3lS b290KSk7CiAKICAgICBhdXRvJiBkZXN0cm95Um9vdFBhcmVudCA9ICpkZXN0cm95Um9vdC5wYXJl bnQoKTsKLSAgICByZW1vdmVBbmREZXN0cm95Q2hpbGQoZGVzdHJveVJvb3QpOworICAgIHJlbW92 ZUFuZERlc3Ryb3koZGVzdHJveVJvb3QpOwogICAgIHJlbW92ZUFub255bW91c1dyYXBwZXJzRm9y SW5saW5lQ2hpbGRyZW5JZk5lZWRlZChkZXN0cm95Um9vdFBhcmVudCk7CiAKICAgICAvLyBBbm9u eW1vdXMgcGFyZW50IG1pZ2h0IGhhdmUgYmVjb21lIGVtcHR5LCB0cnkgdG8gZGVsZXRlIGl0IHRv by4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyLmgKaW5kZXggMzhkYzdjMjcwYmEzZDhmYmFmODhiMWMxM2ViMmRkMzkyZDdjODNh My4uYjhlNDQ3M2FiMTNjM2FhMGQzMGYwNTU5ZWMwMmJmY2I0NWMyODllMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgK QEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW5zZXJ0Q2hpbGQoUmVuZGVyVHJl ZVBvc2l0aW9uJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4pOwogICAgIHZvaWQgaW5zZXJ0Q2hp bGQoUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwogCi0gICAgdm9pZCByZW1vdmVBbmREZXN0 cm95Q2hpbGQoUmVuZGVyT2JqZWN0JiBjaGlsZCk7CisgICAgdm9pZCByZW1vdmVBbmREZXN0cm95 KFJlbmRlck9iamVjdCYgY2hpbGQpOwogICAgIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IHRha2VD aGlsZChSZW5kZXJFbGVtZW50JiwgUmVuZGVyT2JqZWN0JikgV0FSTl9VTlVTRURfUkVUVVJOOwog CiAgICAgLy8gTm9ybWFsaXplQWZ0ZXJJbnNlcnRpb246OlllcyBlbnN1cmVzIHRoYXQgdGhlIGRl c3RpbmF0aW9uIHN1YnRyZWUgaXMgY29uc2lzdGVudCBhZnRlciB0aGUgaW5zZXJ0aW9uIChhbm9u eW1vdXMgd3JhcHBlcnMgZXRjKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNwcAppbmRleCA3MGZjYWQx ZTE0MmIxMzEzN2QzYWU3ZTEzMTFlZWZkYzUzZTRlYzQ1Li5mZDIyNWI3ZjRiN2IxNDVmNmUyNTY4 ZWEyZjMwM2E4MjNiOTUzODdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwCkBAIC0zMTksNyAr MzE5LDcgQEAgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OkJsb2Nr Ojp0YWtlQ2hpbGQoUmVuZGVyQmxvY2smIHBhcmVudCwKIAogICAgICAgICAgICAgLy8gRGVsZXRl IHRoZSBub3ctZW1wdHkgYmxvY2sncyBsaW5lcyBhbmQgbnVrZSBpdC4KICAgICAgICAgICAgIG5l eHRCbG9jay5kZWxldGVMaW5lcygpOwotICAgICAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERl c3Ryb3lDaGlsZChuZXh0QmxvY2spOworICAgICAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERl c3Ryb3kobmV4dEJsb2NrKTsKICAgICAgICAgICAgIG5leHQgPSBudWxscHRyOwogICAgICAgICB9 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyRmlyc3RMZXR0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyRmlyc3RMZXR0ZXIuY3BwCmluZGV4IDg5ZTliM2U4 YjIyYjhiZTM1NGI4M2JhZGY5YWZmZTQyMWFmZWY2OTAuLmMyMjBlMGU2ZWFlNGQzZTc2NDg4ODMy MWQzNjMzZGE5OTBmZTY3Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91 cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckZpcnN0TGV0dGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJGaXJzdExldHRlci5jcHAK QEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpGaXJzdExldHRlcjo6 dXBkYXRlU3R5bGUoUmVuZGVyQmxvY2smIGZpcnN0TGV0dGVyQmxvY2ssCiAgICAgICAgICAgICBy ZW1haW5pbmdUZXh0LT5zZXRGaXJzdExldHRlcigqbmV3Rmlyc3RMZXR0ZXIpOwogICAgICAgICAg ICAgbmV3Rmlyc3RMZXR0ZXItPnNldEZpcnN0TGV0dGVyUmVtYWluaW5nVGV4dCgqcmVtYWluaW5n VGV4dCk7CiAgICAgICAgIH0KLSAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGls ZCgqZmlyc3RMZXR0ZXIpOworICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveSgqZmly c3RMZXR0ZXIpOwogICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGQoKmZpcnN0TGV0dGVyQ29u dGFpbmVyLCBXVEZNb3ZlKG5ld0ZpcnN0TGV0dGVyKSwgbmV4dFNpYmxpbmcpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQpAQCAtMjQxLDcgKzI0MSw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6 OkZpcnN0TGV0dGVyOjpjcmVhdGVSZW5kZXJlcnMoUmVuZGVyQmxvY2smIGZpcnN0TGV0dGVyQmxv CiAKICAgICAgICAgYXV0byogdGV4dE5vZGUgPSBjdXJyZW50VGV4dENoaWxkLnRleHROb2RlKCk7 CiAgICAgICAgIGF1dG8qIGJlZm9yZUNoaWxkID0gY3VycmVudFRleHRDaGlsZC5uZXh0U2libGlu ZygpOwotICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveUNoaWxkKGN1cnJlbnRUZXh0 Q2hpbGQpOworICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveShjdXJyZW50VGV4dENo aWxkKTsKIAogICAgICAgICAvLyBDb25zdHJ1Y3QgYSB0ZXh0IGZyYWdtZW50IGZvciB0aGUgdGV4 dCBhZnRlciB0aGUgZmlyc3QgbGV0dGVyLgogICAgICAgICAvLyBUaGlzIHRleHQgZnJhZ21lbnQg bWlnaHQgYmUgZW1wdHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckxpc3QuY3BwCmluZGV4IDA3YjMyM2YzZDY2MjFj OTc5NTVlN2M5YzkxYzE2MDM0M2U5NTM3NzIuLjBjOWFhODYwOWU3NWJiNTVkMjBjNzZjNzlmZGRk NDhkM2FiNTVmNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlckxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckxpc3QuY3BwCkBAIC04MCw3ICs4MCw3IEBAIHZv aWQgUmVuZGVyVHJlZUJ1aWxkZXI6Okxpc3Q6OnVwZGF0ZUl0ZW1NYXJrZXIoUmVuZGVyTGlzdEl0 ZW0mIGxpc3RJdGVtUmVuZGVyZXIpCiAKICAgICBpZiAoc3R5bGUubGlzdFN0eWxlVHlwZSgpID09 IE5vbmVMaXN0U3R5bGUgJiYgKCFzdHlsZS5saXN0U3R5bGVJbWFnZSgpIHx8IHN0eWxlLmxpc3RT dHlsZUltYWdlKCktPmVycm9yT2NjdXJyZWQoKSkpIHsKICAgICAgICAgaWYgKGF1dG8qIG1hcmtl ciA9IGxpc3RJdGVtUmVuZGVyZXIubWFya2VyUmVuZGVyZXIoKSkKLSAgICAgICAgICAgIG1fYnVp bGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm1hcmtlcik7CisgICAgICAgICAgICBtX2J1aWxk ZXIucmVtb3ZlQW5kRGVzdHJveSgqbWFya2VyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApA QCAtMTIxLDcgKzEyMSw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Okxpc3Q6OnVwZGF0ZUl0 ZW1NYXJrZXIoUmVuZGVyTGlzdEl0ZW0mIGxpc3RJdGVtUmVuZGVyZXIpCiAKICAgICAvLyBJZiBj dXJyZW50IHBhcmVudCBpcyBhbiBhbm9ueW1vdXMgYmxvY2sgdGhhdCBoYXMgbG9zdCBhbGwgaXRz IGNoaWxkcmVuLCBkZXN0cm95IGl0LgogICAgIGlmIChjdXJyZW50UGFyZW50ICYmIGN1cnJlbnRQ YXJlbnQtPmlzQW5vbnltb3VzQmxvY2soKSAmJiAhY3VycmVudFBhcmVudC0+Zmlyc3RDaGlsZCgp ICYmICFkb3duY2FzdDxSZW5kZXJCbG9jaz4oKmN1cnJlbnRQYXJlbnQpLmNvbnRpbnVhdGlvbigp KQotICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveUNoaWxkKCpjdXJyZW50UGFyZW50 KTsKKyAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3koKmN1cnJlbnRQYXJlbnQpOwog fQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHAKaW5kZXggNmE4NTE5MTky MjljOWY3NGI3NzE4MjJhOGI1YzlhNGQ3ZWI1ODk0MS4uOWJlZGFiMTdjNjEwOWUwZWJmMzNjMTFj ZTA3MTdjYmRjNDQ1M2ZlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmNwcApA QCAtMjEyLDExICsyMTIsMTEgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6TXVsdGlDb2x1bW46 OmRlc3Ryb3lGcmFnbWVudGVkRmxvdyhSZW5kZXJCbG9ja0Zsb3cmIGZsb3cKICAgICAgICAgcGFy ZW50QW5kU3Bhbm5lckxpc3QuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKHNwYW5uZXJPcmlnaW5hbFBh cmVudCwgbV9idWlsZGVyLnRha2VDaGlsZCgqc3Bhbm5lci0+cGFyZW50KCksICpzcGFubmVyKSkp OwogICAgIH0KICAgICB3aGlsZSAoYXV0byogY29sdW1uU2V0ID0gbXVsdGlDb2x1bW5GbG93LmZp cnN0TXVsdGlDb2x1bW5TZXQoKSkKLSAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lD aGlsZCgqY29sdW1uU2V0KTsKKyAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3koKmNv bHVtblNldCk7CiAKICAgICBmbG93LmNsZWFyTXVsdGlDb2x1bW5GbG93KCk7CiAgICAgbV9idWls ZGVyLm1vdmVBbGxDaGlsZHJlblRvKG11bHRpQ29sdW1uRmxvdywgZmxvdywgUmVuZGVyVHJlZUJ1 aWxkZXI6Ok5vcm1hbGl6ZUFmdGVySW5zZXJ0aW9uOjpZZXMpOwotICAgIG1fYnVpbGRlci5yZW1v dmVBbmREZXN0cm95Q2hpbGQobXVsdGlDb2x1bW5GbG93KTsKKyAgICBtX2J1aWxkZXIucmVtb3Zl QW5kRGVzdHJveShtdWx0aUNvbHVtbkZsb3cpOwogICAgIGZvciAoYXV0byYgcGFyZW50QW5kU3Bh bm5lciA6IHBhcmVudEFuZFNwYW5uZXJMaXN0KQogICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hp bGQoKnBhcmVudEFuZFNwYW5uZXIuZmlyc3QsIFdURk1vdmUocGFyZW50QW5kU3Bhbm5lci5zZWNv bmQpKTsKIH0KQEAgLTM3MiwxMyArMzcyLDEzIEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Ok11 bHRpQ29sdW1uOjpoYW5kbGVTcGFubmVyUmVtb3ZhbChSZW5kZXJNdWx0aUNvbHVtbkZsb3cmCiB7 CiAgICAgLy8gVGhlIHBsYWNlaG9sZGVyIG1heSBhbHJlYWR5IGhhdmUgYmVlbiByZW1vdmVkLCBi dXQgaWYgaXQgaGFzbid0LCBkbyBzbyBub3cuCiAgICAgaWYgKGF1dG8gcGxhY2Vob2xkZXIgPSBm bG93LnNwYW5uZXJNYXAoKS50YWtlKCZkb3duY2FzdDxSZW5kZXJCb3g+KHNwYW5uZXIpKSkKLSAg ICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqcGxhY2Vob2xkZXIpOworICAg ICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveSgqcGxhY2Vob2xkZXIpOwogCiAgICAgaWYg KGF1dG8qIG5leHQgPSBzcGFubmVyLm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKGF1dG8q IHByZXZpb3VzID0gc3Bhbm5lci5wcmV2aW91c1NpYmxpbmcoKSkgewogICAgICAgICAgICAgaWYg KHByZXZpb3VzLT5pc1JlbmRlck11bHRpQ29sdW1uU2V0KCkgJiYgbmV4dC0+aXNSZW5kZXJNdWx0 aUNvbHVtblNldCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gTWVyZ2UgdHdvIHNldHMgdGhhdCBu byBsb25nZXIgd2lsbCBiZSBzZXBhcmF0ZWQgYnkgYSBzcGFubmVyLgotICAgICAgICAgICAgICAg IG1fYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm5leHQpOworICAgICAgICAgICAgICAg IG1fYnVpbGRlci5yZW1vdmVBbmREZXN0cm95KCpuZXh0KTsKICAgICAgICAgICAgICAgICBwcmV2 aW91cy0+c2V0TmVlZHNMYXlvdXQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy UnVieS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1 aWxkZXJSdWJ5LmNwcAppbmRleCBmOTFhYzY2MTVmMmU3ZTQ0ODRhZGIwMWI0MzZiOTM4ODU0OTgx MDk4Li5mMjViMjk3OWI2ZDY5ZjdhYjU0ZmE2ODVhY2M1NmI1MjFmNzI4ZDdmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1 aWxkZXJSdWJ5LmNwcApAQCAtMTY2LDcgKzE2Niw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6 OlJ1Ynk6Om1vdmVCbG9ja0NoaWxkcmVuKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBSZW5kZXJSdWJ5 CiAgICAgICAgIGF1dG8qIGFub25CbG9ja1RoZXJlID0gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KGxh c3RDaGlsZFRoZXJlKTsKICAgICAgICAgbV9idWlsZGVyLm1vdmVBbGxDaGlsZHJlblRvKCphbm9u QmxvY2tIZXJlLCAqYW5vbkJsb2NrVGhlcmUsIFJlbmRlclRyZWVCdWlsZGVyOjpOb3JtYWxpemVB ZnRlckluc2VydGlvbjo6WWVzKTsKICAgICAgICAgYW5vbkJsb2NrSGVyZS0+ZGVsZXRlTGluZXMo KTsKLSAgICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqYW5vbkJsb2NrSGVy ZSk7CisgICAgICAgIG1fYnVpbGRlci5yZW1vdmVBbmREZXN0cm95KCphbm9uQmxvY2tIZXJlKTsK ICAgICB9CiAgICAgLy8gTW92ZSBhbGwgcmVtYWluaW5nIGNoaWxkcmVuIG5vcm1hbGx5LgogICAg IG1fYnVpbGRlci5tb3ZlQ2hpbGRyZW5Ubyhmcm9tLCB0bywgZnJvbS5maXJzdENoaWxkKCksIGJl Zm9yZUNoaWxkLCBSZW5kZXJUcmVlQnVpbGRlcjo6Tm9ybWFsaXplQWZ0ZXJJbnNlcnRpb246Ok5v KTsKQEAgLTM5Myw3ICszOTMsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVl QnVpbGRlcjo6UnVieTo6dGFrZUNoaWxkKFJlbmRlclJ1YnlBc0lubGluZSYgcAogICAgICAgICBB U1NFUlQoY2hpbGQuaXNCZWZvcmVDb250ZW50KCkgfHwgY2hpbGQuaXNBZnRlckNvbnRlbnQoKSk7 CiAgICAgICAgIGF1dG8mIHBhcmVudCA9ICpjaGlsZC5wYXJlbnQoKTsKICAgICAgICAgYXV0byB0 YWtlbkNoaWxkID0gbV9idWlsZGVyLnRha2VDaGlsZChwYXJlbnQsIGNoaWxkKTsKLSAgICAgICAg bV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZChwYXJlbnQpOworICAgICAgICBtX2J1aWxk ZXIucmVtb3ZlQW5kRGVzdHJveShwYXJlbnQpOwogICAgICAgICByZXR1cm4gdGFrZW5DaGlsZDsK ICAgICB9CiAKQEAgLTQxNyw3ICs0MTcsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5k ZXJUcmVlQnVpbGRlcjo6UnVieTo6dGFrZUNoaWxkKFJlbmRlclJ1YnlBc0Jsb2NrJiBwYQogICAg ICAgICBBU1NFUlQoY2hpbGQuaXNCZWZvcmVDb250ZW50KCkgfHwgY2hpbGQuaXNBZnRlckNvbnRl bnQoKSk7CiAgICAgICAgIGF1dG8mIHBhcmVudCA9ICpjaGlsZC5wYXJlbnQoKTsKICAgICAgICAg YXV0byB0YWtlbkNoaWxkID0gbV9idWlsZGVyLnRha2VDaGlsZChwYXJlbnQsIGNoaWxkKTsKLSAg ICAgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZChwYXJlbnQpOworICAgICAgICBt X2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveShwYXJlbnQpOwogICAgICAgICByZXR1cm4gdGFrZW5D aGlsZDsKICAgICB9CiAK