233818 2021-12-03 09:16:47 -0800 Use FileSystem::readEntireFile everywhere 2022-02-16 20:26:32 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez cgarcia ews-watchlist webkit-bug-importer youennf oldest_to_newest 1820165 0 sihui_liu 2021-12-03 09:16:47 -0800 ... 1822747 1 webkit-bug-importer 2021-12-10 09:17:18 -0800 <rdar://problem/86324895> 1839009 2 451339 sihui_liu 2022-02-08 21:20:40 -0800 Created attachment 451339 Patch 1842155 3 452153 sihui_liu 2022-02-16 00:10:03 -0800 Created attachment 452153 Patch 1842681 4 ews-feeder 2022-02-16 20:26:27 -0800 Committed r289996 (247382@main): <https://commits.webkit.org/247382@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452153. 451339 2022-02-08 21:20:40 -0800 2022-02-16 00:10:01 -0800 Patch bug-233818-20220208212038.patch text/plain 6252 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0NDFiZjc1NDBmYTllYzAw ZGIwZDJkNDI2MDdkMTk4YzdjZDVhZWYuLmE2NzQ5MGI0ZDIzZmVmMDBiNmE3NDVkYzZmYWRhOTVk MjU0OWNlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMDggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEZpbGVTeXN0ZW06OnJlYWRF bnRpcmVGaWxlIGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMzgxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYzMjQ4OTU+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpD YWNoZVN0b3JhZ2U6OkVuZ2luZTo6cmVhZFNpemVGaWxlKToKKyAgICAgICAgKiBTaGFyZWQvUGVy c2lzdGVuY3lVdGlscy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUZvckZpbGUpOgorCiAy MDIyLTAyLTA4ICBKaWdlbiBaaG91ICA8amlnZW4uemhvdUBzb255LmNvbT4KIAogICAgICAgICBb UGxheXN0YXRpb25dIEZpeCBidWlsZCBicmVhayBhZnRlciByMjg5MjQ3IGlmIEVOQUJMRV9TRVJW SUNFX1dPUktFUiBpcyBvZmYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCA2MzQyNWFjNWU1YzUxMjJl MTc1NjM2OWU0NTUzODA2NDcxNzNlNjMzLi43MDU3YjVjMTc3MWI4ZTEzMjE5YWUxYmY5NjE4MjBj NmJkYjFhZmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC01MzYsMjkgKzUzNiwxMSBAQCBzdGQ6 Om9wdGlvbmFsPHVpbnQ2NF90PiBFbmdpbmU6OnJlYWRTaXplRmlsZShjb25zdCBTdHJpbmcmIHBh dGgpCiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBMb2NrZXIgbG9ja2Vy IHsgZ2xvYmFsU2l6ZUZpbGVMb2NrIH07Ci0gICAgYXV0byBmaWxlSGFuZGxlID0gRmlsZVN5c3Rl bTo6b3BlbkZpbGUocGF0aCwgRmlsZVN5c3RlbTo6RmlsZU9wZW5Nb2RlOjpSZWFkKTsKLSAgICBh dXRvIGNsb3NlRmlsZUhhbmRsZSA9IG1ha2VTY29wZUV4aXQoWyZdIHsKLSAgICAgICAgRmlsZVN5 c3RlbTo6Y2xvc2VGaWxlKGZpbGVIYW5kbGUpOwotICAgIH0pOwotCi0gICAgaWYgKCFGaWxlU3lz dGVtOjppc0hhbmRsZVZhbGlkKGZpbGVIYW5kbGUpKQotICAgICAgICByZXR1cm4gc3RkOjpudWxs b3B0OwotCi0gICAgYXV0byBmaWxlU2l6ZSA9IEZpbGVTeXN0ZW06OmZpbGVTaXplKHBhdGgpLnZh bHVlX29yKDApOwotICAgIGlmICghZmlsZVNpemUpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxv cHQ7Ci0KLSAgICB1bnNpZ25lZCBieXRlc1RvUmVhZDsKLSAgICBpZiAoIVdURjo6Y29udmVydFNh ZmVseShmaWxlU2l6ZSwgYnl0ZXNUb1JlYWQpKQotICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0 OwotCi0gICAgLy8gRklYTUU6IE5vIHJlYXNvbiB3ZSBuZWVkIGEgaGVhcCBidWZmZXIgdG8gcmVh ZCBhbiBhcmJpdHJhcnkgbnVtYmVyIG9mIGJ5dGVzIHdoZW4gd2Ugb25seSBzdXBwb3J0IHNtYWxs IGZpbGVzIHRoYXQgY29udGFpbiBudW1lcmFscy4KLSAgICBWZWN0b3I8Y2hhcj4gYnVmZmVyKGJ5 dGVzVG9SZWFkKTsKLSAgICB1bnNpZ25lZCB0b3RhbEJ5dGVzUmVhZCA9IEZpbGVTeXN0ZW06OnJl YWRGcm9tRmlsZShmaWxlSGFuZGxlLCBidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKLSAg ICBpZiAodG90YWxCeXRlc1JlYWQgIT0gYnl0ZXNUb1JlYWQpCisgICAgYXV0byBidWZmZXIgPSBG aWxlU3lzdGVtOjpyZWFkRW50aXJlRmlsZShwYXRoKTsKKyAgICBpZiAoIWJ1ZmZlcikKICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIHJldHVybiBwYXJzZUludGVnZXI8dWludDY0 X3Q+KHsgYnVmZmVyLmRhdGEoKSwgdG90YWxCeXRlc1JlYWQgfSk7CisgICAgcmV0dXJuIHBhcnNl SW50ZWdlcjx1aW50NjRfdD4oeyBidWZmZXItPmRhdGEoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KGJ1ZmZlci0+c2l6ZSgpKSB9KTsKIH0KIAogY2xhc3MgUmVhZE9yaWdpbnNUYXNrQ291bnRlciA6 IHB1YmxpYyBSZWZDb3VudGVkPFJlYWRPcmlnaW5zVGFza0NvdW50ZXI+IHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1BlcnNpc3RlbmN5VXRpbHMuY3BwIGIvU291cmNlL1dlYktp dC9TaGFyZWQvUGVyc2lzdGVuY3lVdGlscy5jcHAKaW5kZXggODc5Nzg3NGIwNDRlMWU4ZGFkNDQ3 MmE4OTg4ODMxNTFhYzc5YWRmZi4uYjFhYTEzOGFmYWFhNjU0ZWFmMjc4YjEwYWE1NjdiMDg4ZDM2 ZmZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUGVyc2lzdGVuY3lVdGlscy5j cHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUGVyc2lzdGVuY3lVdGlscy5jcHAKQEAgLTM5 LDMyICszOSwxMSBAQCBzdGQ6OnVuaXF1ZV9wdHI8S2V5ZWREZWNvZGVyPiBjcmVhdGVGb3JGaWxl KGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsK IAotICAgIGF1dG8gaGFuZGxlID0gRmlsZVN5c3RlbTo6b3BlbkFuZExvY2tGaWxlKHBhdGgsIEZp bGVTeXN0ZW06OkZpbGVPcGVuTW9kZTo6UmVhZCk7Ci0gICAgaWYgKGhhbmRsZSA9PSBGaWxlU3lz dGVtOjppbnZhbGlkUGxhdGZvcm1GaWxlSGFuZGxlKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsK LQotICAgIGF1dG8gZmlsZVNpemUgPSBGaWxlU3lzdGVtOjpmaWxlU2l6ZShoYW5kbGUpLnZhbHVl X29yKDApOwotICAgIGlmICghZmlsZVNpemUpIHsKLSAgICAgICAgRmlsZVN5c3RlbTo6dW5sb2Nr QW5kQ2xvc2VGaWxlKGhhbmRsZSk7Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIH0KLQot ICAgIHNpemVfdCBieXRlc1RvUmVhZDsKLSAgICBpZiAoIVdURjo6Y29udmVydFNhZmVseShmaWxl U2l6ZSwgYnl0ZXNUb1JlYWQpKSB7Ci0gICAgICAgIEZpbGVTeXN0ZW06OnVubG9ja0FuZENsb3Nl RmlsZShoYW5kbGUpOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9Ci0KLSAgICBWZWN0 b3I8dWludDhfdD4gYnVmZmVyKGJ5dGVzVG9SZWFkKTsKLSAgICBzaXplX3QgdG90YWxCeXRlc1Jl YWQgPSBGaWxlU3lzdGVtOjpyZWFkRnJvbUZpbGUoaGFuZGxlLCBidWZmZXIuZGF0YSgpLCBidWZm ZXIuc2l6ZSgpKTsKLQotICAgIEZpbGVTeXN0ZW06OnVubG9ja0FuZENsb3NlRmlsZShoYW5kbGUp OwotCi0gICAgaWYgKHRvdGFsQnl0ZXNSZWFkICE9IGJ5dGVzVG9SZWFkKQorICAgIGF1dG8gYnVm ZmVyID0gRmlsZVN5c3RlbTo6cmVhZEVudGlyZUZpbGUocGF0aCk7CisgICAgaWYgKCFidWZmZXIp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgLy8gRklYTUU6IFdlIHNob3VsZCB0cnkg dG8gbW9kaWZ5IHRoZSBjb25zdHJ1Y3RvciB0byBwYXNzICYmLgotICAgIHJldHVybiBLZXllZERl Y29kZXI6OmRlY29kZXIoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CisgICAgcmV0dXJu IEtleWVkRGVjb2Rlcjo6ZGVjb2RlcihidWZmZXItPmRhdGEoKSwgYnVmZmVyLT5zaXplKCkpOwog fQogCiB2b2lkIHdyaXRlVG9EaXNrKHN0ZDo6dW5pcXVlX3B0cjxLZXllZEVuY29kZXI+JiYgZW5j b2RlciwgU3RyaW5nJiYgcGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBhNWI3MzljNDZkM2IyNmIxNTRkZGNlZTFhM2FmNjFiNmQzZTAxYjA3 Li5hOWQ4MzQyYWQyZmY3MzQxYTYwMDNhYmQyMmFkNzUxZjY1MTZjNTczIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjItMDItMDggIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNl IEZpbGVTeXN0ZW06OnJlYWRFbnRpcmVGaWxlIGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzgxOAorICAgICAgICA8cmRhcjovL3By b2JsZW0vODYzMjQ4OTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvRmlsZU1vbml0b3IuY3BwOgor ICAgICAgICAoVGVzdFdlYktpdEFQSTo6cmVhZENvbnRlbnRzT2ZGaWxlKToKKwogMjAyMi0wMi0w MiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0VXU10g RW1iZWQgYWRkZWQvbW9kaWZpZWQvZGVsZXRlZCBzdGF0dXMgaW50byBjaGFuZ2VkIGZpbGVzCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvRmlsZU1vbml0b3Iu Y3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0ZpbGVNb25pdG9yLmNwcApp bmRleCBjMWNiODkyNzNjOGFhMWRjZjkxZDMzODQxN2EzYmVmMjRhMTI0MjNjLi44ZjJiNTIzZDE5 MTRhN2UxMzcyYmJjY2ZkMGE1MjEyNWZkMzdlMmFmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYkNvcmUvRmlsZU1vbml0b3IuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViQ29yZS9GaWxlTW9uaXRvci5jcHAKQEAgLTEwNiwzMiArMTA2LDExIEBA IHN0YXRpYyBTdHJpbmcgY3JlYXRlQ29tbWFuZChjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IFN0 cmluZyYgcGF5bG9hZCkKIAogc3RhdGljIFN0cmluZyByZWFkQ29udGVudHNPZkZpbGUoY29uc3Qg U3RyaW5nJiBwYXRoKQogewotICAgIGNvbnN0ZXhwciBpbnQgYnVmZmVyU2l6ZSA9IDEwMjQ7Ci0K LSAgICBhdXRvIHNvdXJjZSA9IEZpbGVTeXN0ZW06Om9wZW5GaWxlKHBhdGgsIEZpbGVTeXN0ZW06 OkZpbGVPcGVuTW9kZTo6UmVhZCk7Ci0gICAgaWYgKCFGaWxlU3lzdGVtOjppc0hhbmRsZVZhbGlk KHNvdXJjZSkpCi0gICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwotCi0gICAgU3RyaW5nQnVm ZmVyPExDaGFyPiBidWZmZXIoYnVmZmVyU2l6ZSk7Ci0KLSAgICBhdXRvIGZpbGVDbG9zZXIgPSBX VEY6Om1ha2VTY29wZUV4aXQoW3NvdXJjZV0oKSB7Ci0gICAgICAgIEZpbGVTeXN0ZW06OlBsYXRm b3JtRmlsZUhhbmRsZSBoYW5kbGUgPSBzb3VyY2U7Ci0gICAgICAgIEZpbGVTeXN0ZW06OmNsb3Nl RmlsZShoYW5kbGUpOwotICAgIH0pOwotCi0gICAgLy8gU2luY2Ugd2UgY29udHJvbCB0aGUgdGVz dCBmaWxlcywgd2Uga25vdyB3ZSBvbmx5IG5lZWQgb25lIHJlYWQKLSAgICBpbnQgcmVhZEJ5dGVz ID0gRmlsZVN5c3RlbTo6cmVhZEZyb21GaWxlKHNvdXJjZSwgYnVmZmVyLmNoYXJhY3RlcnMoKSwg YnVmZmVyU2l6ZSk7Ci0gICAgaWYgKHJlYWRCeXRlcyA8IDApCisgICAgYXV0byBidWZmZXIgPSBG aWxlU3lzdGVtOjpyZWFkRW50aXJlRmlsZShwYXRoKTsKKyAgICBpZiAoIWJ1ZmZlcikKICAgICAg ICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAKLSAgICAvLyBTdHJpcCB0aGUgdHJhaWxpbmcgY2Fy cmlhZ2UgcmV0dXJuIGZyb20gdGhlIGZpbGU6Ci0gICAgaWYgKHJlYWRCeXRlcyA+IDEpIHsKLSAg ICAgICAgaW50IGxhc3RCeXRlID0gcmVhZEJ5dGVzIC0gMTsKLSAgICAgICAgaWYgKGJ1ZmZlclts YXN0Qnl0ZV0gPT0gJ1xuJykKLSAgICAgICAgICAgIGJ1ZmZlci5zaHJpbmsobGFzdEJ5dGUpOwot ICAgIH0KLSAgICBBU1NFUlQocmVhZEJ5dGVzIDwgYnVmZmVyU2l6ZSk7Ci0gICAgcmV0dXJuIFN0 cmluZzo6YWRvcHQoV1RGTW92ZShidWZmZXIpKTsKKyAgICByZXR1cm4gU3RyaW5nKHN0YXRpY19j YXN0PGNvbnN0IExDaGFyKj4oYnVmZmVyLT5kYXRhKCkpLCBidWZmZXItPnNpemUoKSk7CiB9CiAK IFRFU1RfRihGaWxlTW9uaXRvclRlc3QsIERldGVjdENoYW5nZSkK 452153 2022-02-16 00:10:03 -0800 2022-02-16 20:26:30 -0800 Patch bug-233818-20220216001003.patch text/plain 6303 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ4YmRiMTkxYTQ2ZGIzZTE0 YTMyZTg0Zjg0YzIxMzE1ZGU0NGQzZDYuLjFkOTgzOWE4NWVlZGY3ZmE0MzVmOWE2ZDczNzdhNGZi MmVmZjRhMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMTYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEZpbGVTeXN0ZW06OnJlYWRF bnRpcmVGaWxlIGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMzgxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYzMjQ4OTU+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpD YWNoZVN0b3JhZ2U6OkVuZ2luZTo6cmVhZFNpemVGaWxlKToKKyAgICAgICAgKiBTaGFyZWQvUGVy c2lzdGVuY3lVdGlscy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUZvckZpbGUpOgorCiAy MDIyLTAyLTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRG8g cHJlbGltaW5hcnkgd29yayB0byBwYXNzIGRvbWFpbiBuYW1lcyB0byBDb3JlTG9jYXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdl RW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9y YWdlRW5naW5lLmNwcAppbmRleCBkZDFmYTIxYzllZWMxM2ZkYjMwOTQ3MjJlYjg5MWZkNjUzOGUz ZTY1Li5iZGFiMThmOTQyOTA1YWNjMmM4NjZlZGE4MzMwOTY1ODI4Y2I2MGRlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VF bmdpbmUuY3BwCkBAIC01NDksMjkgKzU0OSwxMSBAQCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBF bmdpbmU6OnJlYWRTaXplRmlsZShjb25zdCBTdHJpbmcmIHBhdGgpCiAgICAgQVNTRVJUKCFSdW5M b29wOjppc01haW4oKSk7CiAKICAgICBMb2NrZXIgbG9ja2VyIHsgZ2xvYmFsU2l6ZUZpbGVMb2Nr IH07Ci0gICAgYXV0byBmaWxlSGFuZGxlID0gRmlsZVN5c3RlbTo6b3BlbkZpbGUocGF0aCwgRmls ZVN5c3RlbTo6RmlsZU9wZW5Nb2RlOjpSZWFkKTsKLSAgICBhdXRvIGNsb3NlRmlsZUhhbmRsZSA9 IG1ha2VTY29wZUV4aXQoWyZdIHsKLSAgICAgICAgRmlsZVN5c3RlbTo6Y2xvc2VGaWxlKGZpbGVI YW5kbGUpOwotICAgIH0pOwotCi0gICAgaWYgKCFGaWxlU3lzdGVtOjppc0hhbmRsZVZhbGlkKGZp bGVIYW5kbGUpKQotICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotCi0gICAgYXV0byBmaWxl U2l6ZSA9IEZpbGVTeXN0ZW06OmZpbGVTaXplKHBhdGgpLnZhbHVlX29yKDApOwotICAgIGlmICgh ZmlsZVNpemUpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0KLSAgICB1bnNpZ25lZCBi eXRlc1RvUmVhZDsKLSAgICBpZiAoIVdURjo6Y29udmVydFNhZmVseShmaWxlU2l6ZSwgYnl0ZXNU b1JlYWQpKQotICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotCi0gICAgLy8gRklYTUU6IE5v IHJlYXNvbiB3ZSBuZWVkIGEgaGVhcCBidWZmZXIgdG8gcmVhZCBhbiBhcmJpdHJhcnkgbnVtYmVy IG9mIGJ5dGVzIHdoZW4gd2Ugb25seSBzdXBwb3J0IHNtYWxsIGZpbGVzIHRoYXQgY29udGFpbiBu dW1lcmFscy4KLSAgICBWZWN0b3I8Y2hhcj4gYnVmZmVyKGJ5dGVzVG9SZWFkKTsKLSAgICB1bnNp Z25lZCB0b3RhbEJ5dGVzUmVhZCA9IEZpbGVTeXN0ZW06OnJlYWRGcm9tRmlsZShmaWxlSGFuZGxl LCBidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKLSAgICBpZiAodG90YWxCeXRlc1JlYWQg IT0gYnl0ZXNUb1JlYWQpCisgICAgYXV0byBidWZmZXIgPSBGaWxlU3lzdGVtOjpyZWFkRW50aXJl RmlsZShwYXRoKTsKKyAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9w dDsKIAotICAgIHJldHVybiBwYXJzZUludGVnZXI8dWludDY0X3Q+KHsgYnVmZmVyLmRhdGEoKSwg dG90YWxCeXRlc1JlYWQgfSk7CisgICAgcmV0dXJuIHBhcnNlSW50ZWdlcjx1aW50NjRfdD4oeyBi dWZmZXItPmRhdGEoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGJ1ZmZlci0+c2l6ZSgpKSB9KTsK IH0KIAogY2xhc3MgUmVhZE9yaWdpbnNUYXNrQ291bnRlciA6IHB1YmxpYyBSZWZDb3VudGVkPFJl YWRPcmlnaW5zVGFza0NvdW50ZXI+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1BlcnNpc3RlbmN5VXRpbHMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUGVyc2lzdGVuY3lV dGlscy5jcHAKaW5kZXggODc5Nzg3NGIwNDRlMWU4ZGFkNDQ3MmE4OTg4ODMxNTFhYzc5YWRmZi4u YjFhYTEzOGFmYWFhNjU0ZWFmMjc4YjEwYWE1NjdiMDg4ZDM2ZmZlYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9TaGFyZWQvUGVyc2lzdGVuY3lVdGlscy5jcHAKKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvUGVyc2lzdGVuY3lVdGlscy5jcHAKQEAgLTM5LDMyICszOSwxMSBAQCBzdGQ6OnVu aXF1ZV9wdHI8S2V5ZWREZWNvZGVyPiBjcmVhdGVGb3JGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCkK IHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIGF1dG8gaGFuZGxlID0g RmlsZVN5c3RlbTo6b3BlbkFuZExvY2tGaWxlKHBhdGgsIEZpbGVTeXN0ZW06OkZpbGVPcGVuTW9k ZTo6UmVhZCk7Ci0gICAgaWYgKGhhbmRsZSA9PSBGaWxlU3lzdGVtOjppbnZhbGlkUGxhdGZvcm1G aWxlSGFuZGxlKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgIGF1dG8gZmlsZVNpemUg PSBGaWxlU3lzdGVtOjpmaWxlU2l6ZShoYW5kbGUpLnZhbHVlX29yKDApOwotICAgIGlmICghZmls ZVNpemUpIHsKLSAgICAgICAgRmlsZVN5c3RlbTo6dW5sb2NrQW5kQ2xvc2VGaWxlKGhhbmRsZSk7 Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIH0KLQotICAgIHNpemVfdCBieXRlc1RvUmVh ZDsKLSAgICBpZiAoIVdURjo6Y29udmVydFNhZmVseShmaWxlU2l6ZSwgYnl0ZXNUb1JlYWQpKSB7 Ci0gICAgICAgIEZpbGVTeXN0ZW06OnVubG9ja0FuZENsb3NlRmlsZShoYW5kbGUpOwotICAgICAg ICByZXR1cm4gbnVsbHB0cjsKLSAgICB9Ci0KLSAgICBWZWN0b3I8dWludDhfdD4gYnVmZmVyKGJ5 dGVzVG9SZWFkKTsKLSAgICBzaXplX3QgdG90YWxCeXRlc1JlYWQgPSBGaWxlU3lzdGVtOjpyZWFk RnJvbUZpbGUoaGFuZGxlLCBidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKLQotICAgIEZp bGVTeXN0ZW06OnVubG9ja0FuZENsb3NlRmlsZShoYW5kbGUpOwotCi0gICAgaWYgKHRvdGFsQnl0 ZXNSZWFkICE9IGJ5dGVzVG9SZWFkKQorICAgIGF1dG8gYnVmZmVyID0gRmlsZVN5c3RlbTo6cmVh ZEVudGlyZUZpbGUocGF0aCk7CisgICAgaWYgKCFidWZmZXIpCiAgICAgICAgIHJldHVybiBudWxs cHRyOwogCi0gICAgLy8gRklYTUU6IFdlIHNob3VsZCB0cnkgdG8gbW9kaWZ5IHRoZSBjb25zdHJ1 Y3RvciB0byBwYXNzICYmLgotICAgIHJldHVybiBLZXllZERlY29kZXI6OmRlY29kZXIoYnVmZmVy LmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CisgICAgcmV0dXJuIEtleWVkRGVjb2Rlcjo6ZGVjb2Rl cihidWZmZXItPmRhdGEoKSwgYnVmZmVyLT5zaXplKCkpOwogfQogCiB2b2lkIHdyaXRlVG9EaXNr KHN0ZDo6dW5pcXVlX3B0cjxLZXllZEVuY29kZXI+JiYgZW5jb2RlciwgU3RyaW5nJiYgcGF0aCkK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0YTU5 MDk3N2IyM2E5MDMxN2I4MDFhYmY2YmQyODI1NTIyMGMwZmUwLi4wZmM5YWJiYWM4MWQ2MGZmMzNi YjA3YjQ1MDZiZTFhODY4N2JhM2U2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDItMTYgIFNpaHVpIExpdSAg PHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEZpbGVTeXN0ZW06OnJlYWRFbnRp cmVGaWxlIGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMzgxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYzMjQ4OTU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYkNvcmUvRmlsZU1vbml0b3IuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6cmVhZENvbnRlbnRzT2ZGaWxlKToKKwogMjAyMi0wMi0xNSAgTWFyayBMYW0gIDxtYXJrLmxh bUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBIZWFwVHlwZSBhbiBlbnVtIGNsYXNzLgpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0ZpbGVNb25pdG9yLmNw cCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9GaWxlTW9uaXRvci5jcHAKaW5k ZXggYzFjYjg5MjczYzhhYTFkY2Y5MWQzMzg0MTdhM2JlZjI0YTEyNDIzYy4uMjNmNjYxY2YxNmFj MGMzZDdmZmU5YTFjMGVlYmZlY2M3OTE5MGM2OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJDb3JlL0ZpbGVNb25pdG9yLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYkNvcmUvRmlsZU1vbml0b3IuY3BwCkBAIC0xMDYsMzIgKzEwNiwxNSBAQCBz dGF0aWMgU3RyaW5nIGNyZWF0ZUNvbW1hbmQoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJp bmcmIHBheWxvYWQpCiAKIHN0YXRpYyBTdHJpbmcgcmVhZENvbnRlbnRzT2ZGaWxlKGNvbnN0IFN0 cmluZyYgcGF0aCkKIHsKLSAgICBjb25zdGV4cHIgaW50IGJ1ZmZlclNpemUgPSAxMDI0OwotCi0g ICAgYXV0byBzb3VyY2UgPSBGaWxlU3lzdGVtOjpvcGVuRmlsZShwYXRoLCBGaWxlU3lzdGVtOjpG aWxlT3Blbk1vZGU6OlJlYWQpOwotICAgIGlmICghRmlsZVN5c3RlbTo6aXNIYW5kbGVWYWxpZChz b3VyY2UpKQorICAgIGF1dG8gYnVmZmVyID0gRmlsZVN5c3RlbTo6cmVhZEVudGlyZUZpbGUocGF0 aCk7CisgICAgaWYgKCFidWZmZXIpCiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCi0g ICAgU3RyaW5nQnVmZmVyPExDaGFyPiBidWZmZXIoYnVmZmVyU2l6ZSk7Ci0KLSAgICBhdXRvIGZp bGVDbG9zZXIgPSBXVEY6Om1ha2VTY29wZUV4aXQoW3NvdXJjZV0oKSB7Ci0gICAgICAgIEZpbGVT eXN0ZW06OlBsYXRmb3JtRmlsZUhhbmRsZSBoYW5kbGUgPSBzb3VyY2U7Ci0gICAgICAgIEZpbGVT eXN0ZW06OmNsb3NlRmlsZShoYW5kbGUpOwotICAgIH0pOworICAgIFN0cmluZyByZXN1bHQoc3Rh dGljX2Nhc3Q8Y29uc3QgTENoYXIqPihidWZmZXItPmRhdGEoKSksIGJ1ZmZlci0+c2l6ZSgpKTsK KyAgICBpZiAocmVzdWx0LmVuZHNXaXRoKCJcbiIpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnN1 YnN0cmluZygwLCByZXN1bHQubGVuZ3RoKCkgLSAxKTsKIAotICAgIC8vIFNpbmNlIHdlIGNvbnRy b2wgdGhlIHRlc3QgZmlsZXMsIHdlIGtub3cgd2Ugb25seSBuZWVkIG9uZSByZWFkCi0gICAgaW50 IHJlYWRCeXRlcyA9IEZpbGVTeXN0ZW06OnJlYWRGcm9tRmlsZShzb3VyY2UsIGJ1ZmZlci5jaGFy YWN0ZXJzKCksIGJ1ZmZlclNpemUpOwotICAgIGlmIChyZWFkQnl0ZXMgPCAwKQotICAgICAgICBy ZXR1cm4gZW1wdHlTdHJpbmcoKTsKLQotICAgIC8vIFN0cmlwIHRoZSB0cmFpbGluZyBjYXJyaWFn ZSByZXR1cm4gZnJvbSB0aGUgZmlsZToKLSAgICBpZiAocmVhZEJ5dGVzID4gMSkgewotICAgICAg ICBpbnQgbGFzdEJ5dGUgPSByZWFkQnl0ZXMgLSAxOwotICAgICAgICBpZiAoYnVmZmVyW2xhc3RC eXRlXSA9PSAnXG4nKQotICAgICAgICAgICAgYnVmZmVyLnNocmluayhsYXN0Qnl0ZSk7Ci0gICAg fQotICAgIEFTU0VSVChyZWFkQnl0ZXMgPCBidWZmZXJTaXplKTsKLSAgICByZXR1cm4gU3RyaW5n OjphZG9wdChXVEZNb3ZlKGJ1ZmZlcikpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIFRFU1Rf RihGaWxlTW9uaXRvclRlc3QsIERldGVjdENoYW5nZSkK