240165 2022-05-06 05:03:29 -0700 Add lambda for fragmented flow state change handling 2022-05-10 16:59:30 -0700 1 1 1 Unclassified WebKit Layout and Rendering Safari 15 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1867161 0 rbuis 2022-05-06 05:03:29 -0700 Add lambda for fragmented flow state change handling. 1867162 1 458948 rbuis 2022-05-06 05:04:19 -0700 Created attachment 458948 Patch 1867238 2 ews-feeder 2022-05-06 09:28:00 -0700 Committed r293895 (250353@main): <https://commits.webkit.org/250353@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458948. 1867239 3 webkit-bug-importer 2022-05-06 09:28:14 -0700 <rdar://problem/92864516> 1868041 4 zalan 2022-05-10 16:59:30 -0700 This has caused bug 240266 458948 2022-05-06 05:04:19 -0700 2022-05-06 09:28:01 -0700 Patch bug-240165-20220506130418.patch text/plain 9783 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzODg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDExZTAwNGJlYmJkYjdi NDQzMzZmYjlhMTZlYzk0ZTMwZmM5NDFkYy4uMWJiZGMyZTBkY2Q5ZDJjMDc3OGI2NGZiNmVhODI2 YjJmODlhNWJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTA1LTA2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIGxhbWJkYSBmb3IgZnJhZ21l bnRlZCBmbG93IHN0YXRlIGNoYW5nZSBoYW5kbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMTY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxh biBCdWp0YXMuCisKKyAgICAgICAgQWRkIGxhbWJkYSBmb3IgZnJhZ21lbnRlZCBmbG93IHN0YXRl IGNoYW5nZSBoYW5kbGluZworICAgICAgICBhbmQgY2FsbCBpdCBpbiB0aGUgY2FzZSB3aGVyZSB0 aGUgcGFyZW50IGlzIGFmZmVjdGVkLgorCisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVy Ojpub3JtYWxpemVUcmVlQWZ0ZXJTdHlsZUNoYW5nZSk6CisKIDIwMjItMDUtMDYgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IE1lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyB0byBhdm9pZCBwaXhlbCBjb25mb3JtZXJzIGlmIElPU3Vy ZmFjZXMgYXJlIG5vdCBhbGxvd2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCA2MDZhZGFmMGI3MDRhMDNm OTdjMjIwOGY5MGM2NTE1YjllY2Y1NWU2Li40ODNlMzljYWJkZTY3ZThlZjlkYTQ2M2YxNTIzNzdl YzdjM2VjN2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTU5OSw2ICs1OTksNDkgQEAgdm9pZCBSZW5k ZXJUcmVlQnVpbGRlcjo6bm9ybWFsaXplVHJlZUFmdGVyU3R5bGVDaGFuZ2UoUmVuZGVyRWxlbWVu dCYgcmVuZGVyZXIsIFIKICAgICBib29sIGlzT3V0T2ZGbG93UG9zaXRpb25lZCA9IHJlbmRlcmVy LnN0eWxlKCkuaGFzT3V0T2ZGbG93UG9zaXRpb24oKTsKICAgICBib29sIHN0YXJ0c0FmZmVjdGlu Z1BhcmVudCA9IGZhbHNlOwogICAgIGJvb2wgbm9Mb25nZXJBZmZlY3RzUGFyZW50ID0gZmFsc2U7 CisgICAgYXV0byBoYW5kbGVGcmFnbWVudGVkRmxvd1N0YXRlQ2hhbmdlID0gWyZdIHsKKyAgICAg ICAgaWYgKCFyZW5kZXJlci5wYXJlbnQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg Ly8gT3V0IG9mIGZsb3cgY2hpbGRyZW4gb2YgUmVuZGVyTXVsdGlDb2x1bW5GbG93IGFyZSBub3Qg cmVhbGx5IHBhcnQgb2YgdGhlIG11bHRpY29sdW1uIGZsb3cuIFdlIG5lZWQgdG8gZW5zdXJlIHRo YXQgY2hhbmdlcyBpbiBwb3NpdGlvbmluZyBsaWtlIHRoaXMKKyAgICAgICAgLy8gdHJpZ2dlciBp bnNlcnRpb25zIGludG8gdGhlIG11bHRpY29sdW1uIGZsb3cuCisgICAgICAgIGlmIChhdXRvKiBl bmNsb3NpbmdGcmFnbWVudGVkRmxvdyA9IHBhcmVudC5lbmNsb3NpbmdGcmFnbWVudGVkRmxvdygp OyBpczxSZW5kZXJNdWx0aUNvbHVtbkZsb3c+KGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSkgewor ICAgICAgICAgICAgYXV0byBtb3ZpbmdJbnRvTXVsdGljb2x1bW4gPSBbJl0geworICAgICAgICAg ICAgICAgIGlmICh3YXNPdXRPZkZsb3dQb3NpdGlvbmVkICYmICFpc091dE9mRmxvd1Bvc2l0aW9u ZWQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIGlm IChhdXRvKiBjb250YWluaW5nQmxvY2sgPSByZW5kZXJlci5jb250YWluaW5nQmxvY2soKTsgY29u dGFpbmluZ0Jsb2NrICYmIGlzT3V0T2ZGbG93UG9zaXRpb25lZCkgeworICAgICAgICAgICAgICAg ICAgICAvLyBTb21ldGltZXMgdGhlIGZsb3cgc3RhdGUgY291bGQgY2hhbmdlIGV2ZW4gd2hlbiB0 aGUgcmVuZGVyZXIgc3RheXMgb3V0LW9mLWZsb3cgKGUuZyB3aGVuIGdvaW5nIGZyb20gZml4ZWQg dG8gYWJzb2x1dGUgYW5kCisgICAgICAgICAgICAgICAgICAgIC8vIHRoZSBjb250YWluaW5nIGJs b2NrIGlzIGluc2lkZSBhIG11bHRpLWNvbHVtbiBmbG93KS4KKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGNvbnRhaW5pbmdCbG9jay0+ZnJhZ21lbnRlZEZsb3dTdGF0ZSgpID09IFJlbmRlck9i amVjdDo6SW5zaWRlSW5GcmFnbWVudGVkRmxvdworICAgICAgICAgICAgICAgICAgICAgICAgJiYg cmVuZGVyZXIuZnJhZ21lbnRlZEZsb3dTdGF0ZSgpID09IFJlbmRlck9iamVjdDo6Tm90SW5zaWRl RnJhZ21lbnRlZEZsb3c7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgICAgIH0oKTsKKyAgICAgICAgICAgIGlmIChtb3ZpbmdJbnRvTXVs dGljb2x1bW4pIHsKKyAgICAgICAgICAgICAgICByZW5kZXJlci5pbml0aWFsaXplRnJhZ21lbnRl ZEZsb3dTdGF0ZU9uSW5zZXJ0aW9uKCk7CisgICAgICAgICAgICAgICAgbXVsdGlDb2x1bW5CdWls ZGVyKCkubXVsdGlDb2x1bW5EZXNjZW5kYW50SW5zZXJ0ZWQoZG93bmNhc3Q8UmVuZGVyTXVsdGlD b2x1bW5GbG93PigqZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpLCByZW5kZXJlcik7CisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYXV0byBtb3ZpbmdP dXRPZk11bHRpY29sdW1uID0gIXdhc091dE9mRmxvd1Bvc2l0aW9uZWQgJiYgaXNPdXRPZkZsb3dQ b3NpdGlvbmVkOworICAgICAgICAgICAgaWYgKG1vdmluZ091dE9mTXVsdGljb2x1bW4pIHsKKyAg ICAgICAgICAgICAgICBtdWx0aUNvbHVtbkJ1aWxkZXIoKS5yZXN0b3JlQ29sdW1uU3Bhbm5lcnNG b3JDb250YWluZXIocmVuZGVyZXIsIGRvd25jYXN0PFJlbmRlck11bHRpQ29sdW1uRmxvdz4oKmVu Y2xvc2luZ0ZyYWdtZW50ZWRGbG93KSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICAvLyBTdHlsZSBjaGFuZ2UgbWF5IGhhdmUgbW92ZWQgc29t ZSBzdWJ0cmVlIG91dCBvZiB0aGUgZnJhZ21lbnRlZCBmbG93LiBUaGVpciBmbG93IHN0YXRlcyBo YXZlIGFscmVhZHkgYmVlbiB1cGRhdGVkIChzZWUgYWRqdXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9u Q29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQpCisgICAgICAgICAgICAvLyBhbmQgaGVyZSBp cyB3aGVyZSB3ZSB0YWtlIGNhcmUgb2YgdGhlIHJlbWFpbmluZywgc3Bhbm5lciB0cmVlIG11dGF0 aW9uLgorICAgICAgICAgICAgV2Vha0hhc2hTZXQ8UmVuZGVyRWxlbWVudD4gc3Bhbm5lckNvbnRh aW5pbmdCbG9ja1NldDsKKyAgICAgICAgICAgIGZvciAoYXV0byYgZGVzY2VuZGFudCA6IGRlc2Nl bmRhbnRzT2ZUeXBlPFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyPihyZW5kZXJl cikpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byogY29udGFpbmluZ0Jsb2NrID0gZGVzY2Vu ZGFudC5jb250YWluaW5nQmxvY2soKTsgY29udGFpbmluZ0Jsb2NrICYmIGNvbnRhaW5pbmdCbG9j ay0+ZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKSAhPSBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdykK KyAgICAgICAgICAgICAgICAgICAgc3Bhbm5lckNvbnRhaW5pbmdCbG9ja1NldC5hZGQoKmNvbnRh aW5pbmdCbG9jayk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBhdXRvIG9sZEVuY2xvc2lu Z0ZyYWdtZW50ZWRGbG93ID0gV2Vha1B0ciB7ICplbmNsb3NpbmdGcmFnbWVudGVkRmxvdyB9Owor ICAgICAgICAgICAgZm9yIChhdXRvJiBjb250YWluaW5nQmxvY2sgOiBzcGFubmVyQ29udGFpbmlu Z0Jsb2NrU2V0KSB7CisgICAgICAgICAgICAgICAgaWYgKCFvbGRFbmNsb3NpbmdGcmFnbWVudGVk RmxvdykKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgbXVsdGlD b2x1bW5CdWlsZGVyKCkucmVzdG9yZUNvbHVtblNwYW5uZXJzRm9yQ29udGFpbmVyKGNvbnRhaW5p bmdCbG9jaywgZG93bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93Pigqb2xkRW5jbG9zaW5nRnJh Z21lbnRlZEZsb3cpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH07CiAKICAgICBp ZiAoaXM8UmVuZGVyQmxvY2s+KHBhcmVudCkpCiAgICAgICAgIG5vTG9uZ2VyQWZmZWN0c1BhcmVu dCA9ICghd2FzRmxvYXRpbmcgJiYgaXNGbG9hdGluZykgfHwgKCF3YXNPdXRPZkZsb3dQb3NpdGlv bmVkICYmIGlzT3V0T2ZGbG93UG9zaXRpb25lZCk7CkBAIC02MTIsMjkgKzY1NSwxMCBAQCB2b2lk IFJlbmRlclRyZWVCdWlsZGVyOjpub3JtYWxpemVUcmVlQWZ0ZXJTdHlsZUNoYW5nZShSZW5kZXJF bGVtZW50JiByZW5kZXJlciwgUgogICAgICAgICAvLyBXZSBoYXZlIGdvbmUgZnJvbSBub3QgYWZm ZWN0aW5nIHRoZSBpbmxpbmUgc3RhdHVzIG9mIHRoZSBwYXJlbnQgZmxvdyB0byBzdWRkZW5seQog ICAgICAgICAvLyBoYXZpbmcgYW4gaW1wYWN0LiBTZWUgaWYgdGhlcmUgaXMgYSBtaXNtYXRjaCBi ZXR3ZWVuIHRoZSBwYXJlbnQgZmxvdydzCiAgICAgICAgIC8vIGNoaWxkcmVuSW5saW5lKCkgc3Rh dGUgYW5kIG91ciBzdGF0ZS4KLSAgICAgICAgYXV0byogY3VycmVudEVuY2xvc2luZ0ZyYWdtZW50 ID0gcmVuZGVyZXIuZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKTsKICAgICAgICAgaWYgKHJlbmRl cmVyLmlzSW5saW5lKCkgIT0gcmVuZGVyZXIucGFyZW50KCktPmNoaWxkcmVuSW5saW5lKCkpCiAg ICAgICAgICAgICBjaGlsZEZsb3dTdGF0ZUNoYW5nZXNBbmRBZmZlY3RzUGFyZW50QmxvY2socmVu ZGVyZXIpOwogICAgICAgICAvLyBXQVJOSU5HOiBvcmlnaW5hbCBwYXJlbnQgbWlnaHQgYmUgZGVs ZXRlZCBhdCB0aGlzIHBvaW50LgotICAgICAgICBpZiAoYXV0byogbmV3UGFyZW50ID0gcmVuZGVy ZXIucGFyZW50KCkpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBNZXJnZSB0aGlzIHdpdGggdGhl IG11bHRpY29sdW1uIGNvZGUgYmVsb3cgd2Via2l0Lm9yZy9iLzIyODAyNAotICAgICAgICAgICAg YXV0byBuZXdNdWx0aUNvbHVtbkZvclJlbmRlcmVyID0gWyZdKCkgLT4gUmVuZGVyTXVsdGlDb2x1 bW5GbG93KiB7Ci0gICAgICAgICAgICAgICAgLy8gVXBkYXRlIHRoZSBzdGF0ZSB3aGVuIHRoZSBy ZW5kZXJlciBoYXMgbW92ZWQgZnJvbSBvbmUgbXVsdGktY29sdW1uIGZsb3cgdG8gYW5vdGhlci4K LSAgICAgICAgICAgICAgICBhdXRvKiBuZXdFbmNsb3NpbmdGcmFnbWVudGVkRmxvdyA9IG5ld1Bh cmVudC0+ZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKTsKLSAgICAgICAgICAgICAgICBpZiAobmV3 UGFyZW50LT5pc011bHRpQ29sdW1uQmxvY2tGbG93KCkpIHsKLSAgICAgICAgICAgICAgICAgICAg Ly8gVGhpcyByZW5kZXJlciBpcyBhIHNwYW5uZXIgc28gaXQgaXMgbm90IGluIHRoZSBzdWJ0cmVl IG9mIHRoZSBtdWx0aWNvbHVtbiByZW5kZXJlci4gSXQgaXMgcGFyZW50ZWQgZGlyZWN0bHkgdW5k ZXIgdGhlIGJsb2NrIGZsb3cgc28KLSAgICAgICAgICAgICAgICAgICAgLy8gZW5jbG9zaW5nRnJh Z21lbnRlZEZsb3coKSByZXR1cm5zIHRoZSBwYXJlbnQgZW5jbG9zaW5nIGZsb3cuCi0gICAgICAg ICAgICAgICAgICAgIEFTU0VSVChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSAmJiBkb3duY2FzdDxS ZW5kZXJCbG9ja0Zsb3c+KCpuZXdQYXJlbnQpLm11bHRpQ29sdW1uRmxvdygpLT5zcGFubmVyTWFw KCkuY29udGFpbnMoJmRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpKSk7Ci0gICAgICAgICAg ICAgICAgICAgIG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93ID0gZG93bmNhc3Q8UmVuZGVyQmxv Y2tGbG93PigqbmV3UGFyZW50KS5tdWx0aUNvbHVtbkZsb3coKTsKLSAgICAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICAgICAgcmV0dXJuIG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93ICE9IGN1 cnJlbnRFbmNsb3NpbmdGcmFnbWVudCA/IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJNdWx0aUNvbHVt bkZsb3c+KG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSA6IG51bGxwdHI7Ci0gICAgICAgICAg ICB9OwotICAgICAgICAgICAgaWYgKGF1dG8qIG5ld0VuY2xvc2luZ011bHRpQ29sdW1uID0gbmV3 TXVsdGlDb2x1bW5Gb3JSZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICAgICAgLy8gTGV0IHRoZSBm cmFnbWVudGVkIGZsb3cga25vdyB0aGF0IGl0IGhhcyBhIG5ldyBpbi1mbG93IGRlc2NlbmRhbnQu Ci0gICAgICAgICAgICAgICAgcmVuZGVyZXIuaW5pdGlhbGl6ZUZyYWdtZW50ZWRGbG93U3RhdGVP bkluc2VydGlvbigpOwotICAgICAgICAgICAgICAgIG11bHRpQ29sdW1uQnVpbGRlcigpLm11bHRp Q29sdW1uRGVzY2VuZGFudEluc2VydGVkKCpuZXdFbmNsb3NpbmdNdWx0aUNvbHVtbiwgcmVuZGVy ZXIpOwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIGhhbmRsZUZyYWdtZW50ZWRG bG93U3RhdGVDaGFuZ2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNjU3LDQ1ICs2 ODEsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpub3JtYWxpemVUcmVlQWZ0ZXJTdHlsZUNo YW5nZShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgUgogICAgICAgICB9CiAgICAgfQogCi0gICAg Ly8gT3V0IG9mIGZsb3cgY2hpbGRyZW4gb2YgUmVuZGVyTXVsdGlDb2x1bW5GbG93IGFyZSBub3Qg cmVhbGx5IHBhcnQgb2YgdGhlIG11bHRpY29sdW1uIGZsb3cuIFdlIG5lZWQgdG8gZW5zdXJlIHRo YXQgY2hhbmdlcyBpbiBwb3NpdGlvbmluZyBsaWtlIHRoaXMKLSAgICAvLyB0cmlnZ2VyIGluc2Vy dGlvbnMgaW50byB0aGUgbXVsdGljb2x1bW4gZmxvdy4KLSAgICBpZiAoYXV0byogZW5jbG9zaW5n RnJhZ21lbnRlZEZsb3cgPSBwYXJlbnQuZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKTsgaXM8UmVu ZGVyTXVsdGlDb2x1bW5GbG93PihlbmNsb3NpbmdGcmFnbWVudGVkRmxvdykpIHsKLSAgICAgICAg YXV0byBtb3ZpbmdJbnRvTXVsdGljb2x1bW4gPSBbJl0gewotICAgICAgICAgICAgaWYgKHdhc091 dE9mRmxvd1Bvc2l0aW9uZWQgJiYgIWlzT3V0T2ZGbG93UG9zaXRpb25lZCkKLSAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIGlmIChhdXRvKiBjb250YWluaW5nQmxvY2sg PSByZW5kZXJlci5jb250YWluaW5nQmxvY2soKTsgY29udGFpbmluZ0Jsb2NrICYmIGlzT3V0T2ZG bG93UG9zaXRpb25lZCkgewotICAgICAgICAgICAgICAgIC8vIFNvbWV0aW1lcyB0aGUgZmxvdyBz dGF0ZSBjb3VsZCBjaGFuZ2UgZXZlbiB3aGVuIHRoZSByZW5kZXJlciBzdGF5cyBvdXQtb2YtZmxv dyAoZS5nIHdoZW4gZ29pbmcgZnJvbSBmaXhlZCB0byBhYnNvbHV0ZSBhbmQKLSAgICAgICAgICAg ICAgICAvLyB0aGUgY29udGFpbmluZyBibG9jayBpcyBpbnNpZGUgYSBtdWx0aS1jb2x1bW4gZmxv dykuCi0gICAgICAgICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9jay0+ZnJhZ21lbnRlZEZs b3dTdGF0ZSgpID09IFJlbmRlck9iamVjdDo6SW5zaWRlSW5GcmFnbWVudGVkRmxvdwotICAgICAg ICAgICAgICAgICAgICAmJiByZW5kZXJlci5mcmFnbWVudGVkRmxvd1N0YXRlKCkgPT0gUmVuZGVy T2JqZWN0OjpOb3RJbnNpZGVGcmFnbWVudGVkRmxvdzsKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfSgpOwotICAgICAgICBpZiAobW92aW5nSW50b011 bHRpY29sdW1uKSB7Ci0gICAgICAgICAgICByZW5kZXJlci5pbml0aWFsaXplRnJhZ21lbnRlZEZs b3dTdGF0ZU9uSW5zZXJ0aW9uKCk7Ci0gICAgICAgICAgICBtdWx0aUNvbHVtbkJ1aWxkZXIoKS5t dWx0aUNvbHVtbkRlc2NlbmRhbnRJbnNlcnRlZChkb3duY2FzdDxSZW5kZXJNdWx0aUNvbHVtbkZs b3c+KCplbmNsb3NpbmdGcmFnbWVudGVkRmxvdyksIHJlbmRlcmVyKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotICAgICAgICBhdXRvIG1vdmluZ091dE9mTXVsdGljb2x1bW4gPSAh d2FzT3V0T2ZGbG93UG9zaXRpb25lZCAmJiBpc091dE9mRmxvd1Bvc2l0aW9uZWQ7Ci0gICAgICAg IGlmIChtb3ZpbmdPdXRPZk11bHRpY29sdW1uKSB7Ci0gICAgICAgICAgICBtdWx0aUNvbHVtbkJ1 aWxkZXIoKS5yZXN0b3JlQ29sdW1uU3Bhbm5lcnNGb3JDb250YWluZXIocmVuZGVyZXIsIGRvd25j YXN0PFJlbmRlck11bHRpQ29sdW1uRmxvdz4oKmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSk7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICAvLyBTdHlsZSBjaGFuZ2Ug bWF5IGhhdmUgbW92ZWQgc29tZSBzdWJ0cmVlIG91dCBvZiB0aGUgZnJhZ21lbnRlZCBmbG93LiBU aGVpciBmbG93IHN0YXRlcyBoYXZlIGFscmVhZHkgYmVlbiB1cGRhdGVkIChzZWUgYWRqdXN0RnJh Z21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQpCi0gICAgICAg IC8vIGFuZCBoZXJlIGlzIHdoZXJlIHdlIHRha2UgY2FyZSBvZiB0aGUgcmVtYWluaW5nLCBzcGFu bmVyIHRyZWUgbXV0YXRpb24uCi0gICAgICAgIFdlYWtIYXNoU2V0PFJlbmRlckVsZW1lbnQ+IHNw YW5uZXJDb250YWluaW5nQmxvY2tTZXQ7Ci0gICAgICAgIGZvciAoYXV0byYgZGVzY2VuZGFudCA6 IGRlc2NlbmRhbnRzT2ZUeXBlPFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyPihy ZW5kZXJlcikpIHsKLSAgICAgICAgICAgIGlmIChhdXRvKiBjb250YWluaW5nQmxvY2sgPSBkZXNj ZW5kYW50LmNvbnRhaW5pbmdCbG9jaygpOyBjb250YWluaW5nQmxvY2sgJiYgY29udGFpbmluZ0Js b2NrLT5lbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpICE9IGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93 KQotICAgICAgICAgICAgICAgIHNwYW5uZXJDb250YWluaW5nQmxvY2tTZXQuYWRkKCpjb250YWlu aW5nQmxvY2spOwotICAgICAgICB9Ci0gICAgICAgIGF1dG8gb2xkRW5jbG9zaW5nRnJhZ21lbnRl ZEZsb3cgPSBXZWFrUHRyIHsgKmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93IH07Ci0gICAgICAgIGZv ciAoYXV0byYgY29udGFpbmluZ0Jsb2NrIDogc3Bhbm5lckNvbnRhaW5pbmdCbG9ja1NldCkgewot ICAgICAgICAgICAgaWYgKCFvbGRFbmNsb3NpbmdGcmFnbWVudGVkRmxvdykKLSAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgIG11bHRpQ29sdW1uQnVpbGRlcigpLnJlc3RvcmVDb2x1 bW5TcGFubmVyc0ZvckNvbnRhaW5lcihjb250YWluaW5nQmxvY2ssIGRvd25jYXN0PFJlbmRlck11 bHRpQ29sdW1uRmxvdz4oKm9sZEVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSk7Ci0gICAgICAgIH0K LSAgICB9CisgICAgaGFuZGxlRnJhZ21lbnRlZEZsb3dTdGF0ZUNoYW5nZSgpOwogfQogCiB2b2lk IFJlbmRlclRyZWVCdWlsZGVyOjptYWtlQ2hpbGRyZW5Ob25JbmxpbmUoUmVuZGVyQmxvY2smIHBh cmVudCwgUmVuZGVyT2JqZWN0KiBpbnNlcnRpb25Qb2ludCkK