245472 2022-09-21 05:21:46 -0700 [LFC][Integration] Stop adjusting effective display of the root box to 'block' 2022-09-22 10:19:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1900090 0 koivisto 2022-09-21 05:21:46 -0700 It shouldn't be needed. 1900092 1 462493 koivisto 2022-09-21 05:33:07 -0700 Created attachment 462493 Patch 1900101 2 462499 koivisto 2022-09-21 05:57:22 -0700 Created attachment 462499 Patch 1900123 3 webkit-bug-importer 2022-09-21 07:20:24 -0700 <rdar://problem/100222978> 1900145 4 462507 koivisto 2022-09-21 08:44:30 -0700 Created attachment 462507 Patch 1900340 5 462535 koivisto 2022-09-22 04:20:39 -0700 Created attachment 462535 Patch 1900351 6 ews-feeder 2022-09-22 05:35:50 -0700 Commit message contains (OOPS!) and no reviewer found, blocking PR #None 1900355 7 462538 koivisto 2022-09-22 06:04:12 -0700 Created attachment 462538 Patch for landing 1900378 8 ews-feeder 2022-09-22 08:38:42 -0700 Committed 254755@main (b14c7b56eb6e): <https://commits.webkit.org/254755@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462538. 462493 2022-09-21 05:33:07 -0700 2022-09-21 05:57:17 -0700 Patch bug-245472-20220921153305.patch text/plain 5143 koivisto RnJvbSBmOWQ4MmI1MDE5NTE2OWJkN2YxZDMwNmZjYTY4NDhhMmIzNDAxZGQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBXZWQsIDIxIFNlcCAyMDIyIDE1OjIzOjQ5ICswMzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11b SW50ZWdyYXRpb25dIFN0b3AgYWRqdXN0aW5nIGVmZmVjdGl2ZSBkaXNwbGF5IHRvCiAnYmxvY2sn IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDU0NzIgSW5jbHVkZSBh IFJhZGFyIGxpbmsKIChPT1BTISkuCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkl0IHNo b3VsZG4ndCBiZSBuZWVkZWQuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OnJvb3RCb3hTdHlsZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cm9vdEJveEZpcnN0 TGluZVN0eWxlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpidWlsZFRy ZWVGb3JJbmxpbmVDb250ZW50KToKLS0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25Cb3hUcmVlLmNwcCAgfCA0NSArKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MTAgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVl LmNwcAppbmRleCA1NDI4YWMwYjI1M2MuLjUyNGVmMjIzMmVmNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Qm94VHJlZS5jcHAKQEAgLTU0LDE0ICs1NCw5IEBAIG5hbWVzcGFjZSBMYXlvdXRJbnRlZ3JhdGlv biB7CiAKIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IHNtYWxsVHJlZVRocmVzaG9sZCA9IDg7CiAK LS8vIEZJWE1FOiBzZWUgd2Via2l0Lm9yZy9iLzIzMDk2NAotI2RlZmluZSBDQU5fVVNFX0ZJUlNU X0xJTkVfU1RZTEVfUkVTT0xWRSAxCi0KIHN0YXRpYyBSZW5kZXJTdHlsZSByb290Qm94U3R5bGUo Y29uc3QgUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKIHsKICAgICBhdXRvIGNsb25lZFN0eWxl ID0gUmVuZGVyU3R5bGU6OmNsb25lKHJvb3RSZW5kZXJlci5zdHlsZSgpKTsKLSAgICBpZiAoaXM8 UmVuZGVyQmxvY2tGbG93Pihyb290UmVuZGVyZXIpKQotICAgICAgICBjbG9uZWRTdHlsZS5zZXRF ZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiAgICAgaWYgKHJvb3RSZW5kZXJl ci5pc0Fub255bW91c0Jsb2NrKCkpIHsKICAgICAgICAgYXV0byYgYW5vbkJsb2NrUGFyZW50U3R5 bGUgPSByb290UmVuZGVyZXIucGFyZW50KCktPnN0eWxlKCk7CiAgICAgICAgIC8vIG92ZXJmbG93 IGFuZCB0ZXh0LW92ZXJmbG93IHByb3BlcnR5IHZhbHVlcyBkb24ndCBnZXQgZm9yd2FyZGVkIHRv IGFub255bW91cyBibG9jayBib3hlcy4KQEAgLTczLDI1ICs2OCwxNyBAQCBzdGF0aWMgUmVuZGVy U3R5bGUgcm9vdEJveFN0eWxlKGNvbnN0IFJlbmRlckJsb2NrJiByb290UmVuZGVyZXIpCiAgICAg cmV0dXJuIGNsb25lZFN0eWxlOwogfQogCi1zdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0 eWxlPiByb290Qm94Rmlyc3RMaW5lU3R5bGUoY29uc3QgUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJl cikKK3N0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IGZpcnN0TGluZVN0eWxlRm9y KGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCiB7Ci0jaWYgQ0FOX1VTRV9GSVJTVF9MSU5F X1NUWUxFX1JFU09MVkUKLSAgICBhdXRvJiBmaXJzdExpbmVTdHlsZSA9IHJvb3RSZW5kZXJlci5m aXJzdExpbmVTdHlsZSgpOwotICAgIGlmIChyb290UmVuZGVyZXIuc3R5bGUoKSA9PSBmaXJzdExp bmVTdHlsZSkKKyAgICBhdXRvJiBmaXJzdExpbmVTdHlsZSA9IHJlbmRlcmVyLmZpcnN0TGluZVN0 eWxlKCk7CisgICAgaWYgKCZyZW5kZXJlci5zdHlsZSgpID09ICZmaXJzdExpbmVTdHlsZSkKICAg ICAgICAgcmV0dXJuIHsgfTsKLSAgICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNs b25lUHRyKGZpcnN0TGluZVN0eWxlKTsKLSAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93Pihyb290 UmVuZGVyZXIpKQotICAgICAgICBjbG9uZWRTdHlsZS0+c2V0RWZmZWN0aXZlRGlzcGxheShEaXNw bGF5VHlwZTo6QmxvY2spOwotICAgIHJldHVybiBjbG9uZWRTdHlsZTsKLSNlbHNlCi0gICAgVU5V U0VEX1BBUkFNKHJvb3RSZW5kZXJlcik7Ci0gICAgcmV0dXJuIHsgfTsKLSNlbmRpZgorICAgIHJl dHVybiBSZW5kZXJTdHlsZTo6Y2xvbmVQdHIoZmlyc3RMaW5lU3R5bGUpOwogfQogCiBCb3hUcmVl OjpCb3hUcmVlKFJlbmRlckJsb2NrJiByb290UmVuZGVyZXIpCiAgICAgOiBtX3Jvb3RSZW5kZXJl cihyb290UmVuZGVyZXIpCi0gICAgLCBtX3Jvb3QoTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1 dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCByb290Qm94 U3R5bGUocm9vdFJlbmRlcmVyKSwgcm9vdEJveEZpcnN0TGluZVN0eWxlKHJvb3RSZW5kZXJlcikp CisgICAgLCBtX3Jvb3QoTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpC b3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCByb290Qm94U3R5bGUocm9vdFJlbmRl cmVyKSwgZmlyc3RMaW5lU3R5bGVGb3Iocm9vdFJlbmRlcmVyKSkKIHsKICAgICBpZiAocm9vdFJl bmRlcmVyLmlzQW5vbnltb3VzKCkpCiAgICAgICAgIG1fcm9vdC5zZXRJc0Fub255bW91cygpOwpA QCAtMTA3LDExICs5NCw4IEBAIEJveFRyZWU6OkJveFRyZWUoUmVuZGVyQmxvY2smIHJvb3RSZW5k ZXJlcikKIHZvaWQgQm94VHJlZTo6YnVpbGRUcmVlRm9ySW5saW5lQ29udGVudCgpCiB7CiAgICAg YXV0byBjcmVhdGVDaGlsZEJveCA9IFsmXShSZW5kZXJPYmplY3QmIGNoaWxkUmVuZGVyZXIpIC0+ IHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ6OkJveD4gewotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8 UmVuZGVyU3R5bGU+IGZpcnN0TGluZVN0eWxlOwotI2lmIENBTl9VU0VfRklSU1RfTElORV9TVFlM RV9SRVNPTFZFCi0gICAgICAgIGlmICgmY2hpbGRSZW5kZXJlci5zdHlsZSgpICE9ICZjaGlsZFJl bmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpCi0gICAgICAgICAgICBmaXJzdExpbmVTdHlsZSA9IFJl bmRlclN0eWxlOjpjbG9uZVB0cihjaGlsZFJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpOwotI2Vu ZGlmCisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5bGUg PSBmaXJzdExpbmVTdHlsZUZvcihjaGlsZFJlbmRlcmVyKTsKKwogICAgICAgICBpZiAoaXM8UmVu ZGVyQ291bnRlcj4oY2hpbGRSZW5kZXJlcikpIHsKICAgICAgICAgICAgIC8vIFRoaXMgZW5zdXJl cyB0aGF0IElubGluZVRleHRCb3ggKHNlZSBiZWxvdykgYWx3YXlzIGhhcyB1cHRvZGF0ZSBjb3Vu dGVyIHRleHQgKG5vdGUgdGhhdCBSZW5kZXJDb3VudGVyIGlzIGEgdHlwZSBvZiBSZW5kZXJUZXh0 KS4KICAgICAgICAgICAgIGlmIChjaGlsZFJlbmRlcmVyLnByZWZlcnJlZExvZ2ljYWxXaWR0aHNE aXJ0eSgpKSB7CkBAIC0yMzYsMjQgKzIyMCwxNSBAQCB2b2lkIEJveFRyZWU6OnVwZGF0ZVN0eWxl KGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlcikKIHsKICAgICBhdXRvJiBsYXlv dXRCb3ggPSBsYXlvdXRCb3hGb3JSZW5kZXJlcihyZW5kZXJlcik7CiAgICAgYXV0byYgc3R5bGUg PSByZW5kZXJlci5zdHlsZSgpOwotICAgIGF1dG8gZmlyc3RMaW5lU3R5bGUgPSBbJl0gKCkgLT4g c3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiB7Ci0jaWYgQ0FOX1VTRV9GSVJTVF9MSU5FX1NU WUxFX1JFU09MVkUKLSAgICAgICAgaWYgKCZyZW5kZXJlci5zdHlsZSgpICE9ICZyZW5kZXJlci5m aXJzdExpbmVTdHlsZSgpKQotICAgICAgICAgICAgcmV0dXJuIFJlbmRlclN0eWxlOjpjbG9uZVB0 cihyZW5kZXJlci5maXJzdExpbmVTdHlsZSgpKTsKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0j ZWxzZQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSNlbmRpZgotICAgIH07CiAKICAgICBpZiAo JmxheW91dEJveCA9PSAmcm9vdExheW91dEJveCgpKQotICAgICAgICBsYXlvdXRCb3gudXBkYXRl U3R5bGUocm9vdEJveFN0eWxlKGRvd25jYXN0PFJlbmRlckJsb2NrPihyZW5kZXJlcikpLCByb290 Qm94Rmlyc3RMaW5lU3R5bGUoZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSkpOworICAg ICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUocm9vdEJveFN0eWxlKGRvd25jYXN0PFJlbmRlckJs b2NrPihyZW5kZXJlcikpLCBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcikpOwogICAgIGVsc2UK LSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0eWxlLCBmaXJzdExpbmVTdHlsZSgpKTsK KyAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0eWxlLCBmaXJzdExpbmVTdHlsZUZvcihy ZW5kZXJlcikpOwogCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGxheW91dEJveC5maXJzdENoaWxk KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgIGlmIChj aGlsZC0+aXNJbmxpbmVUZXh0Qm94KCkpCi0gICAgICAgICAgICBjaGlsZC0+dXBkYXRlU3R5bGUo UmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkoc3R5bGUsIERpc3Bs YXlUeXBlOjpJbmxpbmUpLCBmaXJzdExpbmVTdHlsZSgpKTsKKyAgICAgICAgICAgIGNoaWxkLT51 cGRhdGVTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnltb3VzU3R5bGVXaXRoRGlzcGxheShz dHlsZSwgRGlzcGxheVR5cGU6OklubGluZSksIGZpcnN0TGluZVN0eWxlRm9yKHJlbmRlcmVyKSk7 CiAgICAgfQogfQogCg== 462499 2022-09-21 05:57:22 -0700 2022-09-21 08:44:26 -0700 Patch bug-245472-20220921155720.patch text/plain 5952 koivisto RnJvbSAzNzM2ZDMzZTVkMzk5NjlhNDM1MTA5OWI1ZmFhNzI2OWVhNDM5M2ZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBXZWQsIDIxIFNlcCAyMDIyIDE1OjIzOjQ5ICswMzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11b SW50ZWdyYXRpb25dIFN0b3AgYWRqdXN0aW5nIGVmZmVjdGl2ZSBkaXNwbGF5IHRvCiAnYmxvY2sn IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDU0NzIgSW5jbHVkZSBh IFJhZGFyIGxpbmsKIChPT1BTISkuCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkl0IHNo b3VsZG4ndCBiZSBuZWVkZWQuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OnJvb3RCb3hTdHlsZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cm9vdEJveEZpcnN0 TGluZVN0eWxlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpidWlsZFRy ZWVGb3JJbmxpbmVDb250ZW50KToKLS0tCiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWly a3MuY3BwICAgICAgICAgfCAgMiArLQogLi4uL2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Qm94VHJlZS5jcHAgIHwgNDUgKysrKystLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAx MSBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVp cmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdRdWlya3MuY3BwCmluZGV4IDM3ZjA3NTgwMzQwNS4uMTAwZWQ0YmEx ZjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmNw cApAQCAtOTcsNyArOTcsNyBAQCBib29sIElubGluZUZvcm1hdHRpbmdRdWlya3M6OmlubGluZUxl dmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3QgSW5saW5lTGV2ZWxCb3gmCiBib29sIElubGluZUZv cm1hdHRpbmdRdWlya3M6Omhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlBdEltYWdlKCkgY29uc3QKIHsK ICAgICBBU1NFUlQobGF5b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSk7Ci0gICAgcmV0dXJuICFm b3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKS5pc1RhYmxlQ2VsbCgpOworICAgIHJldHVybiBsYXlv dXRTdGF0ZSgpLmlzSW5saW5lRm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbigpIHx8ICFmb3Jt YXR0aW5nQ29udGV4dCgpLnJvb3QoKS5pc1RhYmxlQ2VsbCgpOwogfQogCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hU cmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkJveFRyZWUuY3BwCmluZGV4IDU0MjhhYzBiMjUzYy4uNTI0ZWYyMjMyZWY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25C b3hUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25Cb3hUcmVlLmNwcApAQCAtNTQsMTQgKzU0LDkgQEAgbmFtZXNwYWNlIExheW91 dEludGVncmF0aW9uIHsKIAogc3RhdGljIGNvbnN0ZXhwciBzaXplX3Qgc21hbGxUcmVlVGhyZXNo b2xkID0gODsKIAotLy8gRklYTUU6IHNlZSB3ZWJraXQub3JnL2IvMjMwOTY0Ci0jZGVmaW5lIENB Tl9VU0VfRklSU1RfTElORV9TVFlMRV9SRVNPTFZFIDEKLQogc3RhdGljIFJlbmRlclN0eWxlIHJv b3RCb3hTdHlsZShjb25zdCBSZW5kZXJCbG9jayYgcm9vdFJlbmRlcmVyKQogewogICAgIGF1dG8g Y2xvbmVkU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUocm9vdFJlbmRlcmVyLnN0eWxlKCkpOwot ICAgIGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KHJvb3RSZW5kZXJlcikpCi0gICAgICAgIGNsb25l ZFN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKICAgICBpZiAo cm9vdFJlbmRlcmVyLmlzQW5vbnltb3VzQmxvY2soKSkgewogICAgICAgICBhdXRvJiBhbm9uQmxv Y2tQYXJlbnRTdHlsZSA9IHJvb3RSZW5kZXJlci5wYXJlbnQoKS0+c3R5bGUoKTsKICAgICAgICAg Ly8gb3ZlcmZsb3cgYW5kIHRleHQtb3ZlcmZsb3cgcHJvcGVydHkgdmFsdWVzIGRvbid0IGdldCBm b3J3YXJkZWQgdG8gYW5vbnltb3VzIGJsb2NrIGJveGVzLgpAQCAtNzMsMjUgKzY4LDE3IEBAIHN0 YXRpYyBSZW5kZXJTdHlsZSByb290Qm94U3R5bGUoY29uc3QgUmVuZGVyQmxvY2smIHJvb3RSZW5k ZXJlcikKICAgICByZXR1cm4gY2xvbmVkU3R5bGU7CiB9CiAKLXN0YXRpYyBzdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IHJvb3RCb3hGaXJzdExpbmVTdHlsZShjb25zdCBSZW5kZXJCbG9jayYg cm9vdFJlbmRlcmVyKQorc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RM aW5lU3R5bGVGb3IoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlcikKIHsKLSNpZiBDQU5fVVNF X0ZJUlNUX0xJTkVfU1RZTEVfUkVTT0xWRQotICAgIGF1dG8mIGZpcnN0TGluZVN0eWxlID0gcm9v dFJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCk7Ci0gICAgaWYgKHJvb3RSZW5kZXJlci5zdHlsZSgp ID09IGZpcnN0TGluZVN0eWxlKQorICAgIGF1dG8mIGZpcnN0TGluZVN0eWxlID0gcmVuZGVyZXIu Zmlyc3RMaW5lU3R5bGUoKTsKKyAgICBpZiAoJnJlbmRlcmVyLnN0eWxlKCkgPT0gJmZpcnN0TGlu ZVN0eWxlKQogICAgICAgICByZXR1cm4geyB9OwotICAgIGF1dG8gY2xvbmVkU3R5bGUgPSBSZW5k ZXJTdHlsZTo6Y2xvbmVQdHIoZmlyc3RMaW5lU3R5bGUpOwotICAgIGlmIChpczxSZW5kZXJCbG9j a0Zsb3c+KHJvb3RSZW5kZXJlcikpCi0gICAgICAgIGNsb25lZFN0eWxlLT5zZXRFZmZlY3RpdmVE aXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7Ci0gICAgcmV0dXJuIGNsb25lZFN0eWxlOwotI2Vs c2UKLSAgICBVTlVTRURfUEFSQU0ocm9vdFJlbmRlcmVyKTsKLSAgICByZXR1cm4geyB9OwotI2Vu ZGlmCisgICAgcmV0dXJuIFJlbmRlclN0eWxlOjpjbG9uZVB0cihmaXJzdExpbmVTdHlsZSk7CiB9 CiAKIEJveFRyZWU6OkJveFRyZWUoUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKICAgICA6IG1f cm9vdFJlbmRlcmVyKHJvb3RSZW5kZXJlcikKLSAgICAsIG1fcm9vdChMYXlvdXQ6OkJveDo6RWxl bWVudEF0dHJpYnV0ZXMgeyBMYXlvdXQ6OkJveDo6RWxlbWVudFR5cGU6OkdlbmVyaWNFbGVtZW50 IH0sIHJvb3RCb3hTdHlsZShyb290UmVuZGVyZXIpLCByb290Qm94Rmlyc3RMaW5lU3R5bGUocm9v dFJlbmRlcmVyKSkKKyAgICAsIG1fcm9vdChMYXlvdXQ6OkJveDo6RWxlbWVudEF0dHJpYnV0ZXMg eyBMYXlvdXQ6OkJveDo6RWxlbWVudFR5cGU6OkdlbmVyaWNFbGVtZW50IH0sIHJvb3RCb3hTdHls ZShyb290UmVuZGVyZXIpLCBmaXJzdExpbmVTdHlsZUZvcihyb290UmVuZGVyZXIpKQogewogICAg IGlmIChyb290UmVuZGVyZXIuaXNBbm9ueW1vdXMoKSkKICAgICAgICAgbV9yb290LnNldElzQW5v bnltb3VzKCk7CkBAIC0xMDcsMTEgKzk0LDggQEAgQm94VHJlZTo6Qm94VHJlZShSZW5kZXJCbG9j ayYgcm9vdFJlbmRlcmVyKQogdm9pZCBCb3hUcmVlOjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50 KCkKIHsKICAgICBhdXRvIGNyZWF0ZUNoaWxkQm94ID0gWyZdKFJlbmRlck9iamVjdCYgY2hpbGRS ZW5kZXJlcikgLT4gc3RkOjp1bmlxdWVfcHRyPExheW91dDo6Qm94PiB7Ci0gICAgICAgIHN0ZDo6 dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5bGU7Ci0jaWYgQ0FOX1VTRV9GSVJT VF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICAgICAgaWYgKCZjaGlsZFJlbmRlcmVyLnN0eWxlKCkg IT0gJmNoaWxkUmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKSkKLSAgICAgICAgICAgIGZpcnN0TGlu ZVN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lUHRyKGNoaWxkUmVuZGVyZXIuZmlyc3RMaW5lU3R5 bGUoKSk7Ci0jZW5kaWYKKyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBmaXJz dExpbmVTdHlsZSA9IGZpcnN0TGluZVN0eWxlRm9yKGNoaWxkUmVuZGVyZXIpOworCiAgICAgICAg IGlmIChpczxSZW5kZXJDb3VudGVyPihjaGlsZFJlbmRlcmVyKSkgewogICAgICAgICAgICAgLy8g VGhpcyBlbnN1cmVzIHRoYXQgSW5saW5lVGV4dEJveCAoc2VlIGJlbG93KSBhbHdheXMgaGFzIHVw dG9kYXRlIGNvdW50ZXIgdGV4dCAobm90ZSB0aGF0IFJlbmRlckNvdW50ZXIgaXMgYSB0eXBlIG9m IFJlbmRlclRleHQpLgogICAgICAgICAgICAgaWYgKGNoaWxkUmVuZGVyZXIucHJlZmVycmVkTG9n aWNhbFdpZHRoc0RpcnR5KCkpIHsKQEAgLTIzNiwyNCArMjIwLDE1IEBAIHZvaWQgQm94VHJlZTo6 dXBkYXRlU3R5bGUoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyKQogewogICAg IGF1dG8mIGxheW91dEJveCA9IGxheW91dEJveEZvclJlbmRlcmVyKHJlbmRlcmVyKTsKICAgICBh dXRvJiBzdHlsZSA9IHJlbmRlcmVyLnN0eWxlKCk7Ci0gICAgYXV0byBmaXJzdExpbmVTdHlsZSA9 IFsmXSAoKSAtPiBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IHsKLSNpZiBDQU5fVVNFX0ZJ UlNUX0xJTkVfU1RZTEVfUkVTT0xWRQotICAgICAgICBpZiAoJnJlbmRlcmVyLnN0eWxlKCkgIT0g JnJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpCi0gICAgICAgICAgICByZXR1cm4gUmVuZGVyU3R5 bGU6OmNsb25lUHRyKHJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpOwotICAgICAgICByZXR1cm4g bnVsbHB0cjsKLSNlbHNlCi0gICAgICAgIHJldHVybiBudWxscHRyOwotI2VuZGlmCi0gICAgfTsK IAogICAgIGlmICgmbGF5b3V0Qm94ID09ICZyb290TGF5b3V0Qm94KCkpCi0gICAgICAgIGxheW91 dEJveC51cGRhdGVTdHlsZShyb290Qm94U3R5bGUoZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJlbmRl cmVyKSksIHJvb3RCb3hGaXJzdExpbmVTdHlsZShkb3duY2FzdDxSZW5kZXJCbG9jaz4ocmVuZGVy ZXIpKSk7CisgICAgICAgIGxheW91dEJveC51cGRhdGVTdHlsZShyb290Qm94U3R5bGUoZG93bmNh c3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSksIGZpcnN0TGluZVN0eWxlRm9yKHJlbmRlcmVyKSk7 CiAgICAgZWxzZQotICAgICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUoc3R5bGUsIGZpcnN0TGlu ZVN0eWxlKCkpOworICAgICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUoc3R5bGUsIGZpcnN0TGlu ZVN0eWxlRm9yKHJlbmRlcmVyKSk7CiAKICAgICBmb3IgKGF1dG8qIGNoaWxkID0gbGF5b3V0Qm94 LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAg ICAgICAgaWYgKGNoaWxkLT5pc0lubGluZVRleHRCb3goKSkKLSAgICAgICAgICAgIGNoaWxkLT51 cGRhdGVTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnltb3VzU3R5bGVXaXRoRGlzcGxheShz dHlsZSwgRGlzcGxheVR5cGU6OklubGluZSksIGZpcnN0TGluZVN0eWxlKCkpOworICAgICAgICAg ICAgY2hpbGQtPnVwZGF0ZVN0eWxlKFJlbmRlclN0eWxlOjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdp dGhEaXNwbGF5KHN0eWxlLCBEaXNwbGF5VHlwZTo6SW5saW5lKSwgZmlyc3RMaW5lU3R5bGVGb3Io cmVuZGVyZXIpKTsKICAgICB9CiB9CiAK 462507 2022-09-21 08:44:30 -0700 2022-09-22 04:20:34 -0700 Patch bug-245472-20220921184429.patch text/plain 11388 koivisto RnJvbSA2N2JiMDUwNjg4Njk4MzkyYTEyNWFlZGNkZjExZGFlYzc4ZjY1YjEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBXZWQsIDIxIFNlcCAyMDIyIDE4OjM2OjUzICswMzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11b SW50ZWdyYXRpb25dIFN0b3AgYWRqdXN0aW5nIGVmZmVjdGl2ZSBkaXNwbGF5IG9mIHRoZQogcm9v dCBib3ggdG8gJ2Jsb2NrJyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQ1NDcyIEluY2x1ZGUgYQogUmFkYXIgbGluayAoT09QUyEpLgoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpUaGlzIGhhY2sgaXMgbm90IG5lZWRlZC4KCiogU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgoo V2ViQ29yZTo6TGF5b3V0OjpoYXNUZXh0UnVuKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1F1aXJrczo6aGFzU29mdFdyYXBPcHBvcnR1bml0 eUF0SW1hZ2UgY29uc3QpOiBEZWxldGVkLgoKUmVtb3ZlIHRoaXMgcXVpcmsgdGhhdCBkaWRuJ3Qg ZG8gYW55dGhpbmcgYmVmb3JlIHRoaXMgY2hhbmdlIChiZWNhdXNlIHRoZSByb290IGJveCB3YXMg bmV2ZXIgY29uc2lkZXJlZCBhIHRhYmxlIGNlbGwpCmFuZCBub3cgYnJlYWtzIGZhc3QvdGV4dC93 aGl0ZXNwYWNlLzAyMS5odG1sLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmg6CiogU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgoo V2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6CihXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpuZXh0V3JhcE9wcG9ydHVuaXR5IGNvbnN0KToKKiBTb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcDoKKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpyb290Qm94U3R5bGUpOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OmZpcnN0TGluZVN0eWxlRm9yKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpCb3hUcmVlOjpCb3hUcmVlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hU cmVlOjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpCb3hUcmVlOjp1cGRhdGVTdHlsZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 cm9vdEJveEZpcnN0TGluZVN0eWxlKTogRGVsZXRlZC4KCkFsc28gcmVtb3ZlIHRoZSBmaXJzdC1s aW5lIGRlZmluZSBhbmQgY2xlYW4gdXAgdGhlIGZ1bmN0aW9ucy4KLS0tCiAuLi4vaW5saW5lL0lu bGluZUNvbnRlbnRCcmVha2VyLmNwcCAgICAgICAgICAgfCAgMyArLQogLi4uL2lubGluZS9Jbmxp bmVGb3JtYXR0aW5nUXVpcmtzLmNwcCAgICAgICAgIHwgIDYgLS0tCiAuLi4vaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdRdWlya3MuaCAgICAgICAgICAgfCAgMSAtCiAuLi4vaW5saW5lL0lubGluZUxp bmVCdWlsZGVyLmNwcCAgICAgICAgICAgICAgfCAgNyArLS0KIC4uLi9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwICB8IDQ1ICsrKysrLS0tLS0tLS0tLS0tLS0KIDUgZmls ZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Q29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IGYyMmVmNzZkZmQ0Yy4u YmE2ZGYyMjVkMmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFr ZXIuY3BwCkBAIC02NCw4ICs2NCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNMZWFkaW5nVGV4 dENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDCiBzdGF0aWMg aW5saW5lIGJvb2wgaGFzVGV4dFJ1bihjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGlu dW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250ZW50KQogewogICAgIC8vIDxzcGFuPnRleHQ8L3Nw YW4+IGlzIGNvbnNpZGVyZWQgYSB0ZXh0IHJ1biBldmVuIHdpdGggdGhlIFtpbmxpbmUgYm94IHN0 YXJ0XVtpbmxpbmUgYm94IGVuZF0gaW5saW5lIGl0ZW1zLgotICAgIC8vIEJhc2VkIG9uIHN0YW5k YXJkcyBjb21taXQgYm91bmRhcnkgcnVsZXMgaXQgd291bGQgYmUgZW5vdWdoIHRvIGNoZWNrIHRo ZSBmaXJzdCBpbmxpbmUgaXRlbSwgYnV0IGR1ZSB0byB0aGUgdGFibGUgcXVpcmssIHdlIGNhbiBo YXZlCi0gICAgLy8gaW1hZ2UgYW5kIHRleHQgbmV4dCB0byBlYWNoIG90aGVyIGluc2lkZSBhIGNv bnRpbnVvdXMgc2V0IG9mIHJ1bnMgKHNlZSBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtz OjpoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSkuCisgICAgLy8gQmFzZWQgb24gc3RhbmRh cmRzIGNvbW1pdCBib3VuZGFyeSBydWxlcyBpdCB3b3VsZCBiZSBlbm91Z2ggdG8gY2hlY2sgdGhl IGZpcnN0IGlubGluZSBpdGVtLgogICAgIGZvciAoYXV0byYgcnVuIDogY29udGludW91c0NvbnRl bnQucnVucygpKSB7CiAgICAgICAgIGlmIChydW4uaW5saW5lSXRlbS5pc1RleHQoKSkKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nUXVpcmtzLmNwcAppbmRleCAzN2YwNzU4MDM0MDUuLjk4Nzg1NTdlZjZkZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ1F1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5jcHAKQEAgLTk0LDEyICs5 NCw2IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ1F1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveChjb25zdCBJbmxpbmVMZXZlbEJveCYKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJv b2wgSW5saW5lRm9ybWF0dGluZ1F1aXJrczo6aGFzU29mdFdyYXBPcHBvcnR1bml0eUF0SW1hZ2Uo KSBjb25zdAotewotICAgIEFTU0VSVChsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpKTsKLSAg ICByZXR1cm4gIWZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLmlzVGFibGVDZWxsKCk7Ci19Ci0K IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5oCmlu ZGV4IGM3OTI5ZmEyZjM3Yy4uNzdiNzk1YjUyOWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ1F1aXJrcy5oCkBAIC0zOCw3ICszOCw2IEBAIHB1YmxpYzoKICAgICBJ bmxpbmVGb3JtYXR0aW5nUXVpcmtzKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Jik7CiAK ICAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxMaW5lSGVpZ2h0KCkgY29uc3Q7Ci0gICAgYm9v bCBoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSgpIGNvbnN0OwogICAgIGJvb2wgaW5saW5l TGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBJbmxpbmVMZXZlbEJveCYsIGNvbnN0IExpbmVC b3gmKSBjb25zdDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNw cAppbmRleCBhNDczZjM4MjI0MDUuLmY4Zjk4ZjdlNmEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMTM1LDcgKzEzNSw3IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGN1 cnJlbnRUZXh0CiAgICAgcmV0dXJuICFUZXh0VXRpbDo6ZmluZE5leHRCcmVha2FibGVQb3NpdGlv bihsaW5lQnJlYWtJdGVyYXRvciwgMCwgc3R5bGUpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wg aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlu bGluZUZvcm1hdHRpbmdDb250ZXh0LCBjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50LCBjb25zdCBJ bmxpbmVJdGVtJiBuZXh0KQorc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVu aXR5KGNvbnN0IElubGluZUl0ZW0mIGN1cnJlbnQsIGNvbnN0IElubGluZUl0ZW0mIG5leHQpCiB7 CiAgICAgLy8gRklYTUU6IFRyYW5zaXRpb24gbm8td3JhcHBpbmcgbG9naWMgZnJvbSBJbmxpbmVD b250ZW50QnJlYWtlciB0byBoZXJlIHdoZXJlIHdlIGNvbXB1dGUgdGhlIHNvZnQgd3JhcCBvcHBv cnR1bml0eSBpbmRleGVzLgogICAgIC8vICJpcyBhdCIgc2ltcGxlIG1lYW5zIHRoYXQgdGhlcmUn cyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSByaWdodCBhZnRlciB0aGUgW2N1cnJlbnRdLgpAQCAt MTc4LDkgKzE3OCw2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0 eShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lCiAgICAgaWYgKGN1cnJlbnQu bGF5b3V0Qm94KCkuaXNMaXN0TWFya2VyQm94KCkgfHwgbmV4dC5sYXlvdXRCb3goKS5pc0xpc3RN YXJrZXJCb3goKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChjdXJyZW50LmlzQm94 KCkgfHwgbmV4dC5pc0JveCgpKSB7Ci0gICAgICAgIGF1dG8gaXNJbWFnZUNvbnRlbnQgPSBjdXJy ZW50LmxheW91dEJveCgpLmlzSW1hZ2UoKSB8fCBuZXh0LmxheW91dEJveCgpLmlzSW1hZ2UoKTsK LSAgICAgICAgaWYgKGlzSW1hZ2VDb250ZW50ICYmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0Lmxh eW91dFN0YXRlKCkuaW5RdWlya3NNb2RlKCkpCi0gICAgICAgICAgICByZXR1cm4gaW5saW5lRm9y bWF0dGluZ0NvbnRleHQuZm9ybWF0dGluZ1F1aXJrcygpLmhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlB dEltYWdlKCk7CiAgICAgICAgIC8vIFt0ZXh0XVtpbmxpbmUgYm94IHN0YXJ0XVtpbmxpbmUgYm94 IGVuZF1baW5saW5lIGJveF0gKHRleHQ8c3Bhbj48L3NwYW4+PGltZz4pIDogdGhlcmUncyBhIHNv ZnQgd3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVuIHRoZSBbdGV4dF0gYW5kIFtpbWddLgogICAgICAg ICAvLyBUaGUgbGluZSBicmVha2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Ig b3RoZXIgYXRvbWljIGlubGluZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJh Y3Rlci4KICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC03NzIsNyArNzY5LDcgQEAgc2l6ZV90IExp bmVCdWlsZGVyOjpuZXh0V3JhcE9wcG9ydHVuaXR5KHNpemVfdCBzdGFydEluZGV4LCBjb25zdCBM aW5lQnVpbGRlcjo6SW4KICAgICAgICAgLy8gQXQgdGhpcyBwb2ludCBwcmV2aW91cyBhbmQgY3Vy cmVudCBpdGVtcyBhcmUgbm90IG5lY2Vzc2FyaWx5IGFkamFjZW50IGl0ZW1zIGUuZyAicHJldmlv dXM8c3Bhbj5jdXJyZW50PC9zcGFuPiIKICAgICAgICAgYXV0byYgcHJldmlvdXNJdGVtID0gbV9p bmxpbmVJdGVtc1sqcHJldmlvdXNJbmxpbmVJdGVtSW5kZXhdOwogICAgICAgICBhdXRvJiBjdXJy ZW50SXRlbSA9IG1faW5saW5lSXRlbXNbaW5kZXhdOwotICAgICAgICBpZiAoaXNBdFNvZnRXcmFw T3Bwb3J0dW5pdHkobV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgcHJldmlvdXNJdGVtLCBjdXJy ZW50SXRlbSkpIHsKKyAgICAgICAgaWYgKGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KHByZXZpb3Vz SXRlbSwgY3VycmVudEl0ZW0pKSB7CiAgICAgICAgICAgICBpZiAoKnByZXZpb3VzSW5saW5lSXRl bUluZGV4ICsgMSA9PSBpbmRleCAmJiAoIXByZXZpb3VzSXRlbS5pc1RleHQoKSB8fCAhY3VycmVu dEl0ZW0uaXNUZXh0KCkpKSB7CiAgICAgICAgICAgICAgICAgLy8gV2Ugb25seSBrbm93IHRoZSBl eGFjdCBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgaW5kZXggd2hlbiB0aGUgcHJldmlvdXMgYW5kIGN1 cnJlbnQgaXRlbXMgYXJlIG5leHQgdG8gZWFjaCBvdGhlci4KICAgICAgICAgICAgICAgICByZXR1 cm4gaW5kZXg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCmluZGV4IDU0MjhhYzBiMjUzYy4u NTI0ZWYyMjMyZWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcApAQCAtNTQsMTQgKzU0 LDkgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9uIHsKIAogc3RhdGljIGNvbnN0ZXhwciBz aXplX3Qgc21hbGxUcmVlVGhyZXNob2xkID0gODsKIAotLy8gRklYTUU6IHNlZSB3ZWJraXQub3Jn L2IvMjMwOTY0Ci0jZGVmaW5lIENBTl9VU0VfRklSU1RfTElORV9TVFlMRV9SRVNPTFZFIDEKLQog c3RhdGljIFJlbmRlclN0eWxlIHJvb3RCb3hTdHlsZShjb25zdCBSZW5kZXJCbG9jayYgcm9vdFJl bmRlcmVyKQogewogICAgIGF1dG8gY2xvbmVkU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUocm9v dFJlbmRlcmVyLnN0eWxlKCkpOwotICAgIGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KHJvb3RSZW5k ZXJlcikpCi0gICAgICAgIGNsb25lZFN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5 cGU6OkJsb2NrKTsKICAgICBpZiAocm9vdFJlbmRlcmVyLmlzQW5vbnltb3VzQmxvY2soKSkgewog ICAgICAgICBhdXRvJiBhbm9uQmxvY2tQYXJlbnRTdHlsZSA9IHJvb3RSZW5kZXJlci5wYXJlbnQo KS0+c3R5bGUoKTsKICAgICAgICAgLy8gb3ZlcmZsb3cgYW5kIHRleHQtb3ZlcmZsb3cgcHJvcGVy dHkgdmFsdWVzIGRvbid0IGdldCBmb3J3YXJkZWQgdG8gYW5vbnltb3VzIGJsb2NrIGJveGVzLgpA QCAtNzMsMjUgKzY4LDE3IEBAIHN0YXRpYyBSZW5kZXJTdHlsZSByb290Qm94U3R5bGUoY29uc3Qg UmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKICAgICByZXR1cm4gY2xvbmVkU3R5bGU7CiB9CiAK LXN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IHJvb3RCb3hGaXJzdExpbmVTdHls ZShjb25zdCBSZW5kZXJCbG9jayYgcm9vdFJlbmRlcmVyKQorc3RhdGljIHN0ZDo6dW5pcXVlX3B0 cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5bGVGb3IoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5k ZXJlcikKIHsKLSNpZiBDQU5fVVNFX0ZJUlNUX0xJTkVfU1RZTEVfUkVTT0xWRQotICAgIGF1dG8m IGZpcnN0TGluZVN0eWxlID0gcm9vdFJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCk7Ci0gICAgaWYg KHJvb3RSZW5kZXJlci5zdHlsZSgpID09IGZpcnN0TGluZVN0eWxlKQorICAgIGF1dG8mIGZpcnN0 TGluZVN0eWxlID0gcmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKTsKKyAgICBpZiAoJnJlbmRlcmVy LnN0eWxlKCkgPT0gJmZpcnN0TGluZVN0eWxlKQogICAgICAgICByZXR1cm4geyB9OwotICAgIGF1 dG8gY2xvbmVkU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmVQdHIoZmlyc3RMaW5lU3R5bGUpOwot ICAgIGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KHJvb3RSZW5kZXJlcikpCi0gICAgICAgIGNsb25l ZFN0eWxlLT5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7Ci0gICAgcmV0 dXJuIGNsb25lZFN0eWxlOwotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0ocm9vdFJlbmRlcmVyKTsK LSAgICByZXR1cm4geyB9OwotI2VuZGlmCisgICAgcmV0dXJuIFJlbmRlclN0eWxlOjpjbG9uZVB0 cihmaXJzdExpbmVTdHlsZSk7CiB9CiAKIEJveFRyZWU6OkJveFRyZWUoUmVuZGVyQmxvY2smIHJv b3RSZW5kZXJlcikKICAgICA6IG1fcm9vdFJlbmRlcmVyKHJvb3RSZW5kZXJlcikKLSAgICAsIG1f cm9vdChMYXlvdXQ6OkJveDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBMYXlvdXQ6OkJveDo6RWxlbWVu dFR5cGU6OkdlbmVyaWNFbGVtZW50IH0sIHJvb3RCb3hTdHlsZShyb290UmVuZGVyZXIpLCByb290 Qm94Rmlyc3RMaW5lU3R5bGUocm9vdFJlbmRlcmVyKSkKKyAgICAsIG1fcm9vdChMYXlvdXQ6OkJv eDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBMYXlvdXQ6OkJveDo6RWxlbWVudFR5cGU6OkdlbmVyaWNF bGVtZW50IH0sIHJvb3RCb3hTdHlsZShyb290UmVuZGVyZXIpLCBmaXJzdExpbmVTdHlsZUZvcihy b290UmVuZGVyZXIpKQogewogICAgIGlmIChyb290UmVuZGVyZXIuaXNBbm9ueW1vdXMoKSkKICAg ICAgICAgbV9yb290LnNldElzQW5vbnltb3VzKCk7CkBAIC0xMDcsMTEgKzk0LDggQEAgQm94VHJl ZTo6Qm94VHJlZShSZW5kZXJCbG9jayYgcm9vdFJlbmRlcmVyKQogdm9pZCBCb3hUcmVlOjpidWls ZFRyZWVGb3JJbmxpbmVDb250ZW50KCkKIHsKICAgICBhdXRvIGNyZWF0ZUNoaWxkQm94ID0gWyZd KFJlbmRlck9iamVjdCYgY2hpbGRSZW5kZXJlcikgLT4gc3RkOjp1bmlxdWVfcHRyPExheW91dDo6 Qm94PiB7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5 bGU7Ci0jaWYgQ0FOX1VTRV9GSVJTVF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICAgICAgaWYgKCZj aGlsZFJlbmRlcmVyLnN0eWxlKCkgIT0gJmNoaWxkUmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKSkK LSAgICAgICAgICAgIGZpcnN0TGluZVN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lUHRyKGNoaWxk UmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKSk7Ci0jZW5kaWYKKyAgICAgICAgc3RkOjp1bmlxdWVf cHRyPFJlbmRlclN0eWxlPiBmaXJzdExpbmVTdHlsZSA9IGZpcnN0TGluZVN0eWxlRm9yKGNoaWxk UmVuZGVyZXIpOworCiAgICAgICAgIGlmIChpczxSZW5kZXJDb3VudGVyPihjaGlsZFJlbmRlcmVy KSkgewogICAgICAgICAgICAgLy8gVGhpcyBlbnN1cmVzIHRoYXQgSW5saW5lVGV4dEJveCAoc2Vl IGJlbG93KSBhbHdheXMgaGFzIHVwdG9kYXRlIGNvdW50ZXIgdGV4dCAobm90ZSB0aGF0IFJlbmRl ckNvdW50ZXIgaXMgYSB0eXBlIG9mIFJlbmRlclRleHQpLgogICAgICAgICAgICAgaWYgKGNoaWxk UmVuZGVyZXIucHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KCkpIHsKQEAgLTIzNiwyNCArMjIw LDE1IEBAIHZvaWQgQm94VHJlZTo6dXBkYXRlU3R5bGUoY29uc3QgUmVuZGVyQm94TW9kZWxPYmpl Y3QmIHJlbmRlcmVyKQogewogICAgIGF1dG8mIGxheW91dEJveCA9IGxheW91dEJveEZvclJlbmRl cmVyKHJlbmRlcmVyKTsKICAgICBhdXRvJiBzdHlsZSA9IHJlbmRlcmVyLnN0eWxlKCk7Ci0gICAg YXV0byBmaXJzdExpbmVTdHlsZSA9IFsmXSAoKSAtPiBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5 bGU+IHsKLSNpZiBDQU5fVVNFX0ZJUlNUX0xJTkVfU1RZTEVfUkVTT0xWRQotICAgICAgICBpZiAo JnJlbmRlcmVyLnN0eWxlKCkgIT0gJnJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpCi0gICAgICAg ICAgICByZXR1cm4gUmVuZGVyU3R5bGU6OmNsb25lUHRyKHJlbmRlcmVyLmZpcnN0TGluZVN0eWxl KCkpOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSNlbHNlCi0gICAgICAgIHJldHVybiBudWxs cHRyOwotI2VuZGlmCi0gICAgfTsKIAogICAgIGlmICgmbGF5b3V0Qm94ID09ICZyb290TGF5b3V0 Qm94KCkpCi0gICAgICAgIGxheW91dEJveC51cGRhdGVTdHlsZShyb290Qm94U3R5bGUoZG93bmNh c3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSksIHJvb3RCb3hGaXJzdExpbmVTdHlsZShkb3duY2Fz dDxSZW5kZXJCbG9jaz4ocmVuZGVyZXIpKSk7CisgICAgICAgIGxheW91dEJveC51cGRhdGVTdHls ZShyb290Qm94U3R5bGUoZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSksIGZpcnN0TGlu ZVN0eWxlRm9yKHJlbmRlcmVyKSk7CiAgICAgZWxzZQotICAgICAgICBsYXlvdXRCb3gudXBkYXRl U3R5bGUoc3R5bGUsIGZpcnN0TGluZVN0eWxlKCkpOworICAgICAgICBsYXlvdXRCb3gudXBkYXRl U3R5bGUoc3R5bGUsIGZpcnN0TGluZVN0eWxlRm9yKHJlbmRlcmVyKSk7CiAKICAgICBmb3IgKGF1 dG8qIGNoaWxkID0gbGF5b3V0Qm94LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQt Pm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKGNoaWxkLT5pc0lubGluZVRleHRCb3goKSkK LSAgICAgICAgICAgIGNoaWxkLT51cGRhdGVTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnlt b3VzU3R5bGVXaXRoRGlzcGxheShzdHlsZSwgRGlzcGxheVR5cGU6OklubGluZSksIGZpcnN0TGlu ZVN0eWxlKCkpOworICAgICAgICAgICAgY2hpbGQtPnVwZGF0ZVN0eWxlKFJlbmRlclN0eWxlOjpj cmVhdGVBbm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KHN0eWxlLCBEaXNwbGF5VHlwZTo6SW5saW5l KSwgZmlyc3RMaW5lU3R5bGVGb3IocmVuZGVyZXIpKTsKICAgICB9CiB9CiAK 462535 2022-09-22 04:20:39 -0700 2022-09-22 06:04:04 -0700 Patch bug-245472-20220922142037.patch text/plain 14655 koivisto RnJvbSBhODI1NWY3NThiNTA3NGM2Y2RlNTQxMjQ0N2RiZWE4NTIwOTg5Nzc3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBXZWQsIDIxIFNlcCAyMDIyIDE4OjM2OjUzICswMzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11b SW50ZWdyYXRpb25dIFN0b3AgYWRqdXN0aW5nIGVmZmVjdGl2ZSBkaXNwbGF5IG9mIHRoZQogcm9v dCBib3ggdG8gJ2Jsb2NrJyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQ1NDcyIEluY2x1ZGUgYQogUmFkYXIgbGluayAoT09QUyEpLgoKUmV2aWV3ZWQgYnkgQWxhbiBC dWp0YXMuCgpUaGlzIGhhY2sgaXMgbm90IG5lZWRlZC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgooV2Vi Q29yZTo6TGF5b3V0OjpoYXNUZXh0UnVuKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1F1aXJrczo6aGFzU29mdFdyYXBPcHBvcnR1bml0eUF0 SW1hZ2UgY29uc3QpOiBEZWxldGVkLgoKUmVtb3ZlIHRoaXMgcXVpcmsgdGhhdCBkaWRuJ3QgZG8g YW55dGhpbmcgYmVmb3JlIHRoaXMgY2hhbmdlIChiZWNhdXNlIHRoZSByb290IGJveCB3YXMgbmV2 ZXIgY29uc2lkZXJlZCBhIHRhYmxlIGNlbGwpCmFuZCBub3cgYnJlYWtzIGZhc3QvdGV4dC93aGl0 ZXNwYWNlLzAyMS5odG1sLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmg6CiogU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2Vi Q29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6CihXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCdWlsZGVyOjpuZXh0V3JhcE9wcG9ydHVuaXR5IGNvbnN0KToKKiBTb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcDoKKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpyb290Qm94U3R5bGUpOgooV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OmZpcnN0TGluZVN0eWxlRm9yKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpCb3hUcmVlOjpCb3hUcmVlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVl OjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpCb3hUcmVlOjp1cGRhdGVTdHlsZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cm9v dEJveEZpcnN0TGluZVN0eWxlKTogRGVsZXRlZC4KCkFsc28gcmVtb3ZlIHRoZSBmaXJzdC1saW5l IGRlZmluZSBhbmQgY2xlYW4gdXAgdGhlIGZ1bmN0aW9ucy4KLS0tCiBTb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0U3RhdGUuY3BwICAgICAgICAgfCAgMiArLQogLi4uL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5jcHAgICAgICAgICAgIHwgIDMgKy0KIC4uLi9pbmxpbmUvSW5saW5lRm9y bWF0dGluZ1F1aXJrcy5jcHAgICAgICAgICB8ICA2IC0tLQogLi4uL2lubGluZS9JbmxpbmVGb3Jt YXR0aW5nUXVpcmtzLmggICAgICAgICAgIHwgIDEgLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHAgICAgICAgICAgICAgIHwgIDcgKy0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25Cb3hUcmVlLmNwcCAgfCA0NSArKysrKy0tLS0tLS0tLS0tLS0tCiAuLi4vTGF5b3V0 SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAgfCAgMiArCiAuLi4vV2ViQ29yZS9s YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwICAgfCAxMCArKy0tLQogOCBmaWxlcyBjaGFu Z2VkLCAyMSBpbnNlcnRpb25zKCspLCA1NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0xheW91dFN0YXRlLmNwcAppbmRleCAwY2YzYzYzMzU1NGEuLjE5MzlkMTgyNGQwZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCkBAIC0xNzksNyArMTc5LDcgQEAgSW5saW5l Rm9ybWF0dGluZ1N0YXRlJiBMYXlvdXRTdGF0ZTo6ZW5zdXJlSW5saW5lRm9ybWF0dGluZ1N0YXRl KGNvbnN0IENvbnRhaW5lckIKICAgICBpZiAoaXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dEludGVn cmF0aW9uKCkpIHsKICAgICAgICAgaWYgKCFtX3Jvb3RJbmxpbmVGb3JtYXR0aW5nU3RhdGVGb3JJ bnRlZ3JhdGlvbikgewogICAgICAgICAgICAgQVNTRVJUKCZmb3JtYXR0aW5nQ29udGV4dFJvb3Qg PT0gbV9yb290Q29udGFpbmVyLnB0cigpKTsKLSAgICAgICAgICAgIG1fcm9vdElubGluZUZvcm1h dHRpbmdTdGF0ZUZvckludGVncmF0aW9uID0gY3JlYXRlKCk7CisgICAgICAgICAgICBtX3Jvb3RJ bmxpbmVGb3JtYXR0aW5nU3RhdGVGb3JJbnRlZ3JhdGlvbiA9IG1ha2VVbmlxdWU8SW5saW5lRm9y bWF0dGluZ1N0YXRlPihGbG9hdGluZ1N0YXRlOjpjcmVhdGUoKnRoaXMsIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCksICp0aGlzKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gKm1fcm9vdElubGlu ZUZvcm1hdHRpbmdTdGF0ZUZvckludGVncmF0aW9uOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRC cmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCBmMjJlZjc2ZGZkNGMuLmJhNmRmMjI1 ZDJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApA QCAtNjQsOCArNjQsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaGFzTGVhZGluZ1RleHRDb250ZW50 KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQwogc3RhdGljIGlubGluZSBi b29sIGhhc1RleHRSdW4oY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50JiBjb250aW51b3VzQ29udGVudCkKIHsKICAgICAvLyA8c3Bhbj50ZXh0PC9zcGFuPiBpcyBj b25zaWRlcmVkIGEgdGV4dCBydW4gZXZlbiB3aXRoIHRoZSBbaW5saW5lIGJveCBzdGFydF1baW5s aW5lIGJveCBlbmRdIGlubGluZSBpdGVtcy4KLSAgICAvLyBCYXNlZCBvbiBzdGFuZGFyZHMgY29t bWl0IGJvdW5kYXJ5IHJ1bGVzIGl0IHdvdWxkIGJlIGVub3VnaCB0byBjaGVjayB0aGUgZmlyc3Qg aW5saW5lIGl0ZW0sIGJ1dCBkdWUgdG8gdGhlIHRhYmxlIHF1aXJrLCB3ZSBjYW4gaGF2ZQotICAg IC8vIGltYWdlIGFuZCB0ZXh0IG5leHQgdG8gZWFjaCBvdGhlciBpbnNpZGUgYSBjb250aW51b3Vz IHNldCBvZiBydW5zIChzZWUgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGFzU29m dFdyYXBPcHBvcnR1bml0eUF0SW1hZ2UpLgorICAgIC8vIEJhc2VkIG9uIHN0YW5kYXJkcyBjb21t aXQgYm91bmRhcnkgcnVsZXMgaXQgd291bGQgYmUgZW5vdWdoIHRvIGNoZWNrIHRoZSBmaXJzdCBp bmxpbmUgaXRlbS4KICAgICBmb3IgKGF1dG8mIHJ1biA6IGNvbnRpbnVvdXNDb250ZW50LnJ1bnMo KSkgewogICAgICAgICBpZiAocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpCiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJr cy5jcHAKaW5kZXggMzdmMDc1ODAzNDA1Li45ODc4NTU3ZWY2ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRp bmdRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuY3BwCkBAIC05NCwxMiArOTQsNiBAQCBi b29sIElubGluZUZvcm1hdHRpbmdRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3go Y29uc3QgSW5saW5lTGV2ZWxCb3gmCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIElubGlu ZUZvcm1hdHRpbmdRdWlya3M6Omhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlBdEltYWdlKCkgY29uc3QK LXsKLSAgICBBU1NFUlQobGF5b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSk7Ci0gICAgcmV0dXJu ICFmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKS5pc1RhYmxlQ2VsbCgpOwotfQotCiB9CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuaAppbmRleCBjNzky OWZhMmYzN2MuLjc3Yjc5NWI1MjlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdRdWlya3MuaApAQCAtMzgsNyArMzgsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lRm9y bWF0dGluZ1F1aXJrcyhjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwogCiAgICAgSW5s aW5lTGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzU29m dFdyYXBPcHBvcnR1bml0eUF0SW1hZ2UoKSBjb25zdDsKICAgICBib29sIGlubGluZUxldmVsQm94 QWZmZWN0c0xpbmVCb3goY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBMaW5lQm94JikgY29u c3Q7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXgg YTQ3M2YzODIyNDA1Li5mOGY5OGY3ZTZhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5jcHAKQEAgLTEzNSw3ICsxMzUsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZW5k c1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZVRleHRJdGVtJiBjdXJyZW50VGV4 dAogICAgIHJldHVybiAhVGV4dFV0aWw6OmZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24obGluZUJy ZWFrSXRlcmF0b3IsIDAsIHN0eWxlKTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0 V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCwgY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saW5lSXRl bSYgbmV4dCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25z dCBJbmxpbmVJdGVtJiBjdXJyZW50LCBjb25zdCBJbmxpbmVJdGVtJiBuZXh0KQogewogICAgIC8v IEZJWE1FOiBUcmFuc2l0aW9uIG5vLXdyYXBwaW5nIGxvZ2ljIGZyb20gSW5saW5lQ29udGVudEJy ZWFrZXIgdG8gaGVyZSB3aGVyZSB3ZSBjb21wdXRlIHRoZSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkg aW5kZXhlcy4KICAgICAvLyAiaXMgYXQiIHNpbXBsZSBtZWFucyB0aGF0IHRoZXJlJ3MgYSBzb2Z0 IHdyYXAgb3Bwb3J0dW5pdHkgcmlnaHQgYWZ0ZXIgdGhlIFtjdXJyZW50XS4KQEAgLTE3OCw5ICsx NzgsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3Qg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgIGlmIChjdXJyZW50LmxheW91dEJv eCgpLmlzTGlzdE1hcmtlckJveCgpIHx8IG5leHQubGF5b3V0Qm94KCkuaXNMaXN0TWFya2VyQm94 KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoY3VycmVudC5pc0JveCgpIHx8IG5l eHQuaXNCb3goKSkgewotICAgICAgICBhdXRvIGlzSW1hZ2VDb250ZW50ID0gY3VycmVudC5sYXlv dXRCb3goKS5pc0ltYWdlKCkgfHwgbmV4dC5sYXlvdXRCb3goKS5pc0ltYWdlKCk7Ci0gICAgICAg IGlmIChpc0ltYWdlQ29udGVudCAmJiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0 ZSgpLmluUXVpcmtzTW9kZSgpKQotICAgICAgICAgICAgcmV0dXJuIGlubGluZUZvcm1hdHRpbmdD b250ZXh0LmZvcm1hdHRpbmdRdWlya3MoKS5oYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSgp OwogICAgICAgICAvLyBbdGV4dF1baW5saW5lIGJveCBzdGFydF1baW5saW5lIGJveCBlbmRdW2lu bGluZSBib3hdICh0ZXh0PHNwYW4+PC9zcGFuPjxpbWc+KSA6IHRoZXJlJ3MgYSBzb2Z0IHdyYXAg b3Bwb3J0dW5pdHkgYmV0d2VlbiB0aGUgW3RleHRdIGFuZCBbaW1nXS4KICAgICAgICAgLy8gVGhl IGxpbmUgYnJlYWtpbmcgYmVoYXZpb3Igb2YgYSByZXBsYWNlZCBlbGVtZW50IG9yIG90aGVyIGF0 b21pYyBpbmxpbmUgaXMgZXF1aXZhbGVudCB0byBhbiBpZGVvZ3JhcGhpYyBjaGFyYWN0ZXIuCiAg ICAgICAgIHJldHVybiB0cnVlOwpAQCAtNzcyLDcgKzc2OSw3IEBAIHNpemVfdCBMaW5lQnVpbGRl cjo6bmV4dFdyYXBPcHBvcnR1bml0eShzaXplX3Qgc3RhcnRJbmRleCwgY29uc3QgTGluZUJ1aWxk ZXI6OkluCiAgICAgICAgIC8vIEF0IHRoaXMgcG9pbnQgcHJldmlvdXMgYW5kIGN1cnJlbnQgaXRl bXMgYXJlIG5vdCBuZWNlc3NhcmlseSBhZGphY2VudCBpdGVtcyBlLmcgInByZXZpb3VzPHNwYW4+ Y3VycmVudDwvc3Bhbj4iCiAgICAgICAgIGF1dG8mIHByZXZpb3VzSXRlbSA9IG1faW5saW5lSXRl bXNbKnByZXZpb3VzSW5saW5lSXRlbUluZGV4XTsKICAgICAgICAgYXV0byYgY3VycmVudEl0ZW0g PSBtX2lubGluZUl0ZW1zW2luZGV4XTsKLSAgICAgICAgaWYgKGlzQXRTb2Z0V3JhcE9wcG9ydHVu aXR5KG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIHByZXZpb3VzSXRlbSwgY3VycmVudEl0ZW0p KSB7CisgICAgICAgIGlmIChpc0F0U29mdFdyYXBPcHBvcnR1bml0eShwcmV2aW91c0l0ZW0sIGN1 cnJlbnRJdGVtKSkgewogICAgICAgICAgICAgaWYgKCpwcmV2aW91c0lubGluZUl0ZW1JbmRleCAr IDEgPT0gaW5kZXggJiYgKCFwcmV2aW91c0l0ZW0uaXNUZXh0KCkgfHwgIWN1cnJlbnRJdGVtLmlz VGV4dCgpKSkgewogICAgICAgICAgICAgICAgIC8vIFdlIG9ubHkga25vdyB0aGUgZXhhY3Qgc29m dCB3cmFwIG9wcG9ydHVuaXR5IGluZGV4IHdoZW4gdGhlIHByZXZpb3VzIGFuZCBjdXJyZW50IGl0 ZW1zIGFyZSBuZXh0IHRvIGVhY2ggb3RoZXIuCiAgICAgICAgICAgICAgICAgcmV0dXJuIGluZGV4 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA1NDI4YWMwYjI1M2MuLjUyNGVmMjIz MmVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTU0LDE0ICs1NCw5IEBAIG5h bWVzcGFjZSBMYXlvdXRJbnRlZ3JhdGlvbiB7CiAKIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IHNt YWxsVHJlZVRocmVzaG9sZCA9IDg7CiAKLS8vIEZJWE1FOiBzZWUgd2Via2l0Lm9yZy9iLzIzMDk2 NAotI2RlZmluZSBDQU5fVVNFX0ZJUlNUX0xJTkVfU1RZTEVfUkVTT0xWRSAxCi0KIHN0YXRpYyBS ZW5kZXJTdHlsZSByb290Qm94U3R5bGUoY29uc3QgUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikK IHsKICAgICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lKHJvb3RSZW5kZXJl ci5zdHlsZSgpKTsKLSAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93Pihyb290UmVuZGVyZXIpKQot ICAgICAgICBjbG9uZWRTdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9j ayk7CiAgICAgaWYgKHJvb3RSZW5kZXJlci5pc0Fub255bW91c0Jsb2NrKCkpIHsKICAgICAgICAg YXV0byYgYW5vbkJsb2NrUGFyZW50U3R5bGUgPSByb290UmVuZGVyZXIucGFyZW50KCktPnN0eWxl KCk7CiAgICAgICAgIC8vIG92ZXJmbG93IGFuZCB0ZXh0LW92ZXJmbG93IHByb3BlcnR5IHZhbHVl cyBkb24ndCBnZXQgZm9yd2FyZGVkIHRvIGFub255bW91cyBibG9jayBib3hlcy4KQEAgLTczLDI1 ICs2OCwxNyBAQCBzdGF0aWMgUmVuZGVyU3R5bGUgcm9vdEJveFN0eWxlKGNvbnN0IFJlbmRlckJs b2NrJiByb290UmVuZGVyZXIpCiAgICAgcmV0dXJuIGNsb25lZFN0eWxlOwogfQogCi1zdGF0aWMg c3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiByb290Qm94Rmlyc3RMaW5lU3R5bGUoY29uc3Qg UmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKK3N0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVy U3R5bGU+IGZpcnN0TGluZVN0eWxlRm9yKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCiB7 Ci0jaWYgQ0FOX1VTRV9GSVJTVF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICBhdXRvJiBmaXJzdExp bmVTdHlsZSA9IHJvb3RSZW5kZXJlci5maXJzdExpbmVTdHlsZSgpOwotICAgIGlmIChyb290UmVu ZGVyZXIuc3R5bGUoKSA9PSBmaXJzdExpbmVTdHlsZSkKKyAgICBhdXRvJiBmaXJzdExpbmVTdHls ZSA9IHJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCk7CisgICAgaWYgKCZyZW5kZXJlci5zdHlsZSgp ID09ICZmaXJzdExpbmVTdHlsZSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICBhdXRvIGNsb25l ZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lUHRyKGZpcnN0TGluZVN0eWxlKTsKLSAgICBpZiAo aXM8UmVuZGVyQmxvY2tGbG93Pihyb290UmVuZGVyZXIpKQotICAgICAgICBjbG9uZWRTdHlsZS0+ c2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwotICAgIHJldHVybiBjbG9u ZWRTdHlsZTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHJvb3RSZW5kZXJlcik7Ci0gICAgcmV0 dXJuIHsgfTsKLSNlbmRpZgorICAgIHJldHVybiBSZW5kZXJTdHlsZTo6Y2xvbmVQdHIoZmlyc3RM aW5lU3R5bGUpOwogfQogCiBCb3hUcmVlOjpCb3hUcmVlKFJlbmRlckJsb2NrJiByb290UmVuZGVy ZXIpCiAgICAgOiBtX3Jvb3RSZW5kZXJlcihyb290UmVuZGVyZXIpCi0gICAgLCBtX3Jvb3QoTGF5 b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpH ZW5lcmljRWxlbWVudCB9LCByb290Qm94U3R5bGUocm9vdFJlbmRlcmVyKSwgcm9vdEJveEZpcnN0 TGluZVN0eWxlKHJvb3RSZW5kZXJlcikpCisgICAgLCBtX3Jvb3QoTGF5b3V0OjpCb3g6OkVsZW1l bnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9 LCByb290Qm94U3R5bGUocm9vdFJlbmRlcmVyKSwgZmlyc3RMaW5lU3R5bGVGb3Iocm9vdFJlbmRl cmVyKSkKIHsKICAgICBpZiAocm9vdFJlbmRlcmVyLmlzQW5vbnltb3VzKCkpCiAgICAgICAgIG1f cm9vdC5zZXRJc0Fub255bW91cygpOwpAQCAtMTA3LDExICs5NCw4IEBAIEJveFRyZWU6OkJveFRy ZWUoUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKIHZvaWQgQm94VHJlZTo6YnVpbGRUcmVlRm9y SW5saW5lQ29udGVudCgpCiB7CiAgICAgYXV0byBjcmVhdGVDaGlsZEJveCA9IFsmXShSZW5kZXJP YmplY3QmIGNoaWxkUmVuZGVyZXIpIC0+IHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ6OkJveD4gewot ICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IGZpcnN0TGluZVN0eWxlOwotI2lm IENBTl9VU0VfRklSU1RfTElORV9TVFlMRV9SRVNPTFZFCi0gICAgICAgIGlmICgmY2hpbGRSZW5k ZXJlci5zdHlsZSgpICE9ICZjaGlsZFJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpCi0gICAgICAg ICAgICBmaXJzdExpbmVTdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZVB0cihjaGlsZFJlbmRlcmVy LmZpcnN0TGluZVN0eWxlKCkpOwotI2VuZGlmCisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5k ZXJTdHlsZT4gZmlyc3RMaW5lU3R5bGUgPSBmaXJzdExpbmVTdHlsZUZvcihjaGlsZFJlbmRlcmVy KTsKKwogICAgICAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4oY2hpbGRSZW5kZXJlcikpIHsKICAg ICAgICAgICAgIC8vIFRoaXMgZW5zdXJlcyB0aGF0IElubGluZVRleHRCb3ggKHNlZSBiZWxvdykg YWx3YXlzIGhhcyB1cHRvZGF0ZSBjb3VudGVyIHRleHQgKG5vdGUgdGhhdCBSZW5kZXJDb3VudGVy IGlzIGEgdHlwZSBvZiBSZW5kZXJUZXh0KS4KICAgICAgICAgICAgIGlmIChjaGlsZFJlbmRlcmVy LnByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKSB7CkBAIC0yMzYsMjQgKzIyMCwxNSBAQCB2 b2lkIEJveFRyZWU6OnVwZGF0ZVN0eWxlKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5k ZXJlcikKIHsKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsYXlvdXRCb3hGb3JSZW5kZXJlcihyZW5k ZXJlcik7CiAgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci5zdHlsZSgpOwotICAgIGF1dG8gZmly c3RMaW5lU3R5bGUgPSBbJl0gKCkgLT4gc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiB7Ci0j aWYgQ0FOX1VTRV9GSVJTVF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICAgICAgaWYgKCZyZW5kZXJl ci5zdHlsZSgpICE9ICZyZW5kZXJlci5maXJzdExpbmVTdHlsZSgpKQotICAgICAgICAgICAgcmV0 dXJuIFJlbmRlclN0eWxlOjpjbG9uZVB0cihyZW5kZXJlci5maXJzdExpbmVTdHlsZSgpKTsKLSAg ICAgICAgcmV0dXJuIG51bGxwdHI7Ci0jZWxzZQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSNl bmRpZgotICAgIH07CiAKICAgICBpZiAoJmxheW91dEJveCA9PSAmcm9vdExheW91dEJveCgpKQot ICAgICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUocm9vdEJveFN0eWxlKGRvd25jYXN0PFJlbmRl ckJsb2NrPihyZW5kZXJlcikpLCByb290Qm94Rmlyc3RMaW5lU3R5bGUoZG93bmNhc3Q8UmVuZGVy QmxvY2s+KHJlbmRlcmVyKSkpOworICAgICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUocm9vdEJv eFN0eWxlKGRvd25jYXN0PFJlbmRlckJsb2NrPihyZW5kZXJlcikpLCBmaXJzdExpbmVTdHlsZUZv cihyZW5kZXJlcikpOwogICAgIGVsc2UKLSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0 eWxlLCBmaXJzdExpbmVTdHlsZSgpKTsKKyAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0 eWxlLCBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcikpOwogCiAgICAgZm9yIChhdXRvKiBjaGls ZCA9IGxheW91dEJveC5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2li bGluZygpKSB7CiAgICAgICAgIGlmIChjaGlsZC0+aXNJbmxpbmVUZXh0Qm94KCkpCi0gICAgICAg ICAgICBjaGlsZC0+dXBkYXRlU3R5bGUoUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxl V2l0aERpc3BsYXkoc3R5bGUsIERpc3BsYXlUeXBlOjpJbmxpbmUpLCBmaXJzdExpbmVTdHlsZSgp KTsKKyAgICAgICAgICAgIGNoaWxkLT51cGRhdGVTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRlQW5v bnltb3VzU3R5bGVXaXRoRGlzcGxheShzdHlsZSwgRGlzcGxheVR5cGU6OklubGluZSksIGZpcnN0 TGluZVN0eWxlRm9yKHJlbmRlcmVyKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5l Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA1MGFk Nzc5MzkwNGEuLjk5NTE2ZjU4Njc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0xMTcsNiArMTE3LDggQEAg dm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAgLy8gQ29sbGVjdCBvdmVyZmxvdyBmcm9t IGJveGVzLgogICAgICAgICBmb3IgKDsgYm94SW5kZXggPCBib3hlcy5zaXplKCkgJiYgYm94ZXNb Ym94SW5kZXhdLmxpbmVJbmRleCgpID09IGxpbmVJbmRleDsgKytib3hJbmRleCkgewogICAgICAg ICAgICAgYXV0byYgYm94ID0gYm94ZXNbYm94SW5kZXhdOworICAgICAgICAgICAgaWYgKGJveC5p c1Jvb3RJbmxpbmVCb3goKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAg ICAgbGluZUlua092ZXJmbG93UmVjdC51bml0ZShib3guaW5rT3ZlcmZsb3coKSk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCmluZGV4IDIzZDlh ZWMxYzdmZi4uYzUzMzM0NTRlN2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv bGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dEJveC5jcHAKQEAgLTgzLDggKzgzLDggQEAgYm9vbCBCb3g6OmVzdGFibGlz aGVzRm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogewogICAgIC8vIFdlIG5lZWQgdGhlIGZpbmFs IHRyZWUgc3RydWN0dXJlIHRvIHRlbGwgd2hldGhlciBhIGJveCBlc3RhYmxpc2hlcyBhIGNlcnRh aW4gZm9ybWF0dGluZyBjb250ZXh0LiAKICAgICBBU1NFUlQoIVBoYXNlOjppc0luVHJlZUJ1aWxk aW5nKCkpOwotICAgIHJldHVybiBlc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKQot ICAgICAgICB8fCBlc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkKKyAgICByZXR1 cm4gZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpCisgICAgICAgIHx8IGVzdGFi bGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpCiAgICAgICAgIHx8IGVzdGFibGlzaGVzVGFi bGVGb3JtYXR0aW5nQ29udGV4dCgpCiAgICAgICAgIHx8IGVzdGFibGlzaGVzRmxleEZvcm1hdHRp bmdDb250ZXh0KCkKICAgICAgICAgfHwgZXN0YWJsaXNoZXNJbmRlcGVuZGVudEZvcm1hdHRpbmdD b250ZXh0KCk7CkBAIC05Miw5ICs5Miw2IEBAIGJvb2wgQm94Ojplc3RhYmxpc2hlc0Zvcm1hdHRp bmdDb250ZXh0KCkgY29uc3QKIAogYm9vbCBCb3g6OmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5n Q29udGV4dCgpIGNvbnN0CiB7Ci0gICAgaWYgKGlzSW50ZWdyYXRpb25Sb290KCkpCi0gICAgICAg IHJldHVybiB0cnVlOwotCiAgICAgLy8gSUNCIGFsd2F5cyBjcmVhdGVzIGEgbmV3IChpbml0YWwp IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBpZiAoaXM8SW5pdGlhbENvbnRhaW5pbmdC bG9jaz4oKnRoaXMpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTEyNyw2ICsxMjQsOSBAQCBi b29sIEJveDo6ZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QKIAogYm9v bCBCb3g6OmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogeworICAg IGlmIChpc0ludGVncmF0aW9uUm9vdCgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIC8v IDkuNC4yIElubGluZSBmb3JtYXR0aW5nIGNvbnRleHRzCiAgICAgLy8gQW4gaW5saW5lIGZvcm1h dHRpbmcgY29udGV4dCBpcyBlc3RhYmxpc2hlZCBieSBhIGJsb2NrIGNvbnRhaW5lciBib3ggdGhh dCBjb250YWlucyBubyBibG9jay1sZXZlbCBib3hlcy4KICAgICBpZiAoIWlzQmxvY2tDb250YWlu ZXIoKSkK 462538 2022-09-22 06:04:12 -0700 2022-09-22 10:19:28 -0700 Patch for landing bug-245472-20220922160411.patch text/plain 14652 koivisto RnJvbSBhOGRhZDU0MmI5Y2ZmODU5NGZmNTE1ODM1ZjQ5Mjk4YzYyYjYxODI5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBXZWQsIDIxIFNlcCAyMDIyIDE4OjM2OjUzICswMzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11b SW50ZWdyYXRpb25dIFN0b3AgYWRqdXN0aW5nIGVmZmVjdGl2ZSBkaXNwbGF5IG9mIHRoZQogcm9v dCBib3ggdG8gJ2Jsb2NrJyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQ1NDcyCiA8cmRhcjovL3Byb2JsZW0vMTAwMjIyOTc4PgoKUmV2aWV3ZWQgYnkgQWxhbiBCdWp0 YXMuCgpUaGlzIGhhY2sgaXMgbm90IG5lZWRlZC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgooV2ViQ29y ZTo6TGF5b3V0OjpoYXNUZXh0UnVuKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ1F1aXJrczo6aGFzU29mdFdyYXBPcHBvcnR1bml0eUF0SW1h Z2UgY29uc3QpOiBEZWxldGVkLgoKUmVtb3ZlIHRoaXMgcXVpcmsgdGhhdCBkaWRuJ3QgZG8gYW55 dGhpbmcgYmVmb3JlIHRoaXMgY2hhbmdlIChiZWNhdXNlIHRoZSByb290IGJveCB3YXMgbmV2ZXIg Y29uc2lkZXJlZCBhIHRhYmxlIGNlbGwpCmFuZCBub3cgYnJlYWtzIGZhc3QvdGV4dC93aGl0ZXNw YWNlLzAyMS5odG1sLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nUXVpcmtzLmg6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29y ZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6CihXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCdWlsZGVyOjpuZXh0V3JhcE9wcG9ydHVuaXR5IGNvbnN0KToKKiBTb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcDoKKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpyb290Qm94U3R5bGUpOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OmZpcnN0TGluZVN0eWxlRm9yKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpC b3hUcmVlOjpCb3hUcmVlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpi dWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpC b3hUcmVlOjp1cGRhdGVTdHlsZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cm9vdEJv eEZpcnN0TGluZVN0eWxlKTogRGVsZXRlZC4KCkFsc28gcmVtb3ZlIHRoZSBmaXJzdC1saW5lIGRl ZmluZSBhbmQgY2xlYW4gdXAgdGhlIGZ1bmN0aW9ucy4KLS0tCiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0U3RhdGUuY3BwICAgICAgICAgfCAgMiArLQogLi4uL2lubGluZS9JbmxpbmVDb250 ZW50QnJlYWtlci5jcHAgICAgICAgICAgIHwgIDMgKy0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ1F1aXJrcy5jcHAgICAgICAgICB8ICA2IC0tLQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nUXVpcmtzLmggICAgICAgICAgIHwgIDEgLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRl ci5jcHAgICAgICAgICAgICAgIHwgIDcgKy0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Cb3hUcmVlLmNwcCAgfCA0NSArKysrKy0tLS0tLS0tLS0tLS0tCiAuLi4vTGF5b3V0SW50 ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAgfCAgMiArCiAuLi4vV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwICAgfCAxMCArKy0tLQogOCBmaWxlcyBjaGFuZ2Vk LCAyMSBpbnNlcnRpb25zKCspLCA1NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xh eW91dFN0YXRlLmNwcAppbmRleCAwY2YzYzYzMzU1NGEuLjE5MzlkMTgyNGQwZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCkBAIC0xNzksNyArMTc5LDcgQEAgSW5saW5lRm9y bWF0dGluZ1N0YXRlJiBMYXlvdXRTdGF0ZTo6ZW5zdXJlSW5saW5lRm9ybWF0dGluZ1N0YXRlKGNv bnN0IENvbnRhaW5lckIKICAgICBpZiAoaXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dEludGVncmF0 aW9uKCkpIHsKICAgICAgICAgaWYgKCFtX3Jvb3RJbmxpbmVGb3JtYXR0aW5nU3RhdGVGb3JJbnRl Z3JhdGlvbikgewogICAgICAgICAgICAgQVNTRVJUKCZmb3JtYXR0aW5nQ29udGV4dFJvb3QgPT0g bV9yb290Q29udGFpbmVyLnB0cigpKTsKLSAgICAgICAgICAgIG1fcm9vdElubGluZUZvcm1hdHRp bmdTdGF0ZUZvckludGVncmF0aW9uID0gY3JlYXRlKCk7CisgICAgICAgICAgICBtX3Jvb3RJbmxp bmVGb3JtYXR0aW5nU3RhdGVGb3JJbnRlZ3JhdGlvbiA9IG1ha2VVbmlxdWU8SW5saW5lRm9ybWF0 dGluZ1N0YXRlPihGbG9hdGluZ1N0YXRlOjpjcmVhdGUoKnRoaXMsIGZvcm1hdHRpbmdDb250ZXh0 Um9vdCksICp0aGlzKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gKm1fcm9vdElubGluZUZv cm1hdHRpbmdTdGF0ZUZvckludGVncmF0aW9uOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCBmMjJlZjc2ZGZkNGMuLmJhNmRmMjI1ZDJi NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApAQCAt NjQsOCArNjQsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaGFzTGVhZGluZ1RleHRDb250ZW50KGNv bnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQwogc3RhdGljIGlubGluZSBib29s IGhhc1RleHRSdW4oY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50 JiBjb250aW51b3VzQ29udGVudCkKIHsKICAgICAvLyA8c3Bhbj50ZXh0PC9zcGFuPiBpcyBjb25z aWRlcmVkIGEgdGV4dCBydW4gZXZlbiB3aXRoIHRoZSBbaW5saW5lIGJveCBzdGFydF1baW5saW5l IGJveCBlbmRdIGlubGluZSBpdGVtcy4KLSAgICAvLyBCYXNlZCBvbiBzdGFuZGFyZHMgY29tbWl0 IGJvdW5kYXJ5IHJ1bGVzIGl0IHdvdWxkIGJlIGVub3VnaCB0byBjaGVjayB0aGUgZmlyc3QgaW5s aW5lIGl0ZW0sIGJ1dCBkdWUgdG8gdGhlIHRhYmxlIHF1aXJrLCB3ZSBjYW4gaGF2ZQotICAgIC8v IGltYWdlIGFuZCB0ZXh0IG5leHQgdG8gZWFjaCBvdGhlciBpbnNpZGUgYSBjb250aW51b3VzIHNl dCBvZiBydW5zIChzZWUgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGFzU29mdFdy YXBPcHBvcnR1bml0eUF0SW1hZ2UpLgorICAgIC8vIEJhc2VkIG9uIHN0YW5kYXJkcyBjb21taXQg Ym91bmRhcnkgcnVsZXMgaXQgd291bGQgYmUgZW5vdWdoIHRvIGNoZWNrIHRoZSBmaXJzdCBpbmxp bmUgaXRlbS4KICAgICBmb3IgKGF1dG8mIHJ1biA6IGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKSkg ewogICAgICAgICBpZiAocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5j cHAKaW5kZXggMzdmMDc1ODAzNDA1Li45ODc4NTU3ZWY2ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdR dWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuY3BwCkBAIC05NCwxMiArOTQsNiBAQCBib29s IElubGluZUZvcm1hdHRpbmdRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29u c3QgSW5saW5lTGV2ZWxCb3gmCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIElubGluZUZv cm1hdHRpbmdRdWlya3M6Omhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlBdEltYWdlKCkgY29uc3QKLXsK LSAgICBBU1NFUlQobGF5b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSk7Ci0gICAgcmV0dXJuICFm b3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKS5pc1RhYmxlQ2VsbCgpOwotfQotCiB9CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdRdWlya3MuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdRdWlya3MuaAppbmRleCBjNzkyOWZh MmYzN2MuLjc3Yjc5NWI1MjlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1F1aXJrcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1h dHRpbmdRdWlya3MuaApAQCAtMzgsNyArMzgsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lRm9ybWF0 dGluZ1F1aXJrcyhjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwogCiAgICAgSW5saW5l TGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzU29mdFdy YXBPcHBvcnR1bml0eUF0SW1hZ2UoKSBjb25zdDsKICAgICBib29sIGlubGluZUxldmVsQm94QWZm ZWN0c0xpbmVCb3goY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBMaW5lQm94JikgY29uc3Q7 CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggYTQ3 M2YzODIyNDA1Li5mOGY5OGY3ZTZhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5jcHAKQEAgLTEzNSw3ICsxMzUsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZW5kc1dp dGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZVRleHRJdGVtJiBjdXJyZW50VGV4dAog ICAgIHJldHVybiAhVGV4dFV0aWw6OmZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24obGluZUJyZWFr SXRlcmF0b3IsIDAsIHN0eWxlKTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0V3Jh cE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0 aW5nQ29udGV4dCwgY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saW5lSXRlbSYg bmV4dCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJ bmxpbmVJdGVtJiBjdXJyZW50LCBjb25zdCBJbmxpbmVJdGVtJiBuZXh0KQogewogICAgIC8vIEZJ WE1FOiBUcmFuc2l0aW9uIG5vLXdyYXBwaW5nIGxvZ2ljIGZyb20gSW5saW5lQ29udGVudEJyZWFr ZXIgdG8gaGVyZSB3aGVyZSB3ZSBjb21wdXRlIHRoZSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgaW5k ZXhlcy4KICAgICAvLyAiaXMgYXQiIHNpbXBsZSBtZWFucyB0aGF0IHRoZXJlJ3MgYSBzb2Z0IHdy YXAgb3Bwb3J0dW5pdHkgcmlnaHQgYWZ0ZXIgdGhlIFtjdXJyZW50XS4KQEAgLTE3OCw5ICsxNzgs NiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgIGlmIChjdXJyZW50LmxheW91dEJveCgp LmlzTGlzdE1hcmtlckJveCgpIHx8IG5leHQubGF5b3V0Qm94KCkuaXNMaXN0TWFya2VyQm94KCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoY3VycmVudC5pc0JveCgpIHx8IG5leHQu aXNCb3goKSkgewotICAgICAgICBhdXRvIGlzSW1hZ2VDb250ZW50ID0gY3VycmVudC5sYXlvdXRC b3goKS5pc0ltYWdlKCkgfHwgbmV4dC5sYXlvdXRCb3goKS5pc0ltYWdlKCk7Ci0gICAgICAgIGlm IChpc0ltYWdlQ29udGVudCAmJiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgp LmluUXVpcmtzTW9kZSgpKQotICAgICAgICAgICAgcmV0dXJuIGlubGluZUZvcm1hdHRpbmdDb250 ZXh0LmZvcm1hdHRpbmdRdWlya3MoKS5oYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSgpOwog ICAgICAgICAvLyBbdGV4dF1baW5saW5lIGJveCBzdGFydF1baW5saW5lIGJveCBlbmRdW2lubGlu ZSBib3hdICh0ZXh0PHNwYW4+PC9zcGFuPjxpbWc+KSA6IHRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bw b3J0dW5pdHkgYmV0d2VlbiB0aGUgW3RleHRdIGFuZCBbaW1nXS4KICAgICAgICAgLy8gVGhlIGxp bmUgYnJlYWtpbmcgYmVoYXZpb3Igb2YgYSByZXBsYWNlZCBlbGVtZW50IG9yIG90aGVyIGF0b21p YyBpbmxpbmUgaXMgZXF1aXZhbGVudCB0byBhbiBpZGVvZ3JhcGhpYyBjaGFyYWN0ZXIuCiAgICAg ICAgIHJldHVybiB0cnVlOwpAQCAtNzcyLDcgKzc2OSw3IEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6 bmV4dFdyYXBPcHBvcnR1bml0eShzaXplX3Qgc3RhcnRJbmRleCwgY29uc3QgTGluZUJ1aWxkZXI6 OkluCiAgICAgICAgIC8vIEF0IHRoaXMgcG9pbnQgcHJldmlvdXMgYW5kIGN1cnJlbnQgaXRlbXMg YXJlIG5vdCBuZWNlc3NhcmlseSBhZGphY2VudCBpdGVtcyBlLmcgInByZXZpb3VzPHNwYW4+Y3Vy cmVudDwvc3Bhbj4iCiAgICAgICAgIGF1dG8mIHByZXZpb3VzSXRlbSA9IG1faW5saW5lSXRlbXNb KnByZXZpb3VzSW5saW5lSXRlbUluZGV4XTsKICAgICAgICAgYXV0byYgY3VycmVudEl0ZW0gPSBt X2lubGluZUl0ZW1zW2luZGV4XTsKLSAgICAgICAgaWYgKGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5 KG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIHByZXZpb3VzSXRlbSwgY3VycmVudEl0ZW0pKSB7 CisgICAgICAgIGlmIChpc0F0U29mdFdyYXBPcHBvcnR1bml0eShwcmV2aW91c0l0ZW0sIGN1cnJl bnRJdGVtKSkgewogICAgICAgICAgICAgaWYgKCpwcmV2aW91c0lubGluZUl0ZW1JbmRleCArIDEg PT0gaW5kZXggJiYgKCFwcmV2aW91c0l0ZW0uaXNUZXh0KCkgfHwgIWN1cnJlbnRJdGVtLmlzVGV4 dCgpKSkgewogICAgICAgICAgICAgICAgIC8vIFdlIG9ubHkga25vdyB0aGUgZXhhY3Qgc29mdCB3 cmFwIG9wcG9ydHVuaXR5IGluZGV4IHdoZW4gdGhlIHByZXZpb3VzIGFuZCBjdXJyZW50IGl0ZW1z IGFyZSBuZXh0IHRvIGVhY2ggb3RoZXIuCiAgICAgICAgICAgICAgICAgcmV0dXJuIGluZGV4Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA1NDI4YWMwYjI1M2MuLjUyNGVmMjIzMmVm NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTU0LDE0ICs1NCw5IEBAIG5hbWVz cGFjZSBMYXlvdXRJbnRlZ3JhdGlvbiB7CiAKIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IHNtYWxs VHJlZVRocmVzaG9sZCA9IDg7CiAKLS8vIEZJWE1FOiBzZWUgd2Via2l0Lm9yZy9iLzIzMDk2NAot I2RlZmluZSBDQU5fVVNFX0ZJUlNUX0xJTkVfU1RZTEVfUkVTT0xWRSAxCi0KIHN0YXRpYyBSZW5k ZXJTdHlsZSByb290Qm94U3R5bGUoY29uc3QgUmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKIHsK ICAgICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lKHJvb3RSZW5kZXJlci5z dHlsZSgpKTsKLSAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93Pihyb290UmVuZGVyZXIpKQotICAg ICAgICBjbG9uZWRTdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7 CiAgICAgaWYgKHJvb3RSZW5kZXJlci5pc0Fub255bW91c0Jsb2NrKCkpIHsKICAgICAgICAgYXV0 byYgYW5vbkJsb2NrUGFyZW50U3R5bGUgPSByb290UmVuZGVyZXIucGFyZW50KCktPnN0eWxlKCk7 CiAgICAgICAgIC8vIG92ZXJmbG93IGFuZCB0ZXh0LW92ZXJmbG93IHByb3BlcnR5IHZhbHVlcyBk b24ndCBnZXQgZm9yd2FyZGVkIHRvIGFub255bW91cyBibG9jayBib3hlcy4KQEAgLTczLDI1ICs2 OCwxNyBAQCBzdGF0aWMgUmVuZGVyU3R5bGUgcm9vdEJveFN0eWxlKGNvbnN0IFJlbmRlckJsb2Nr JiByb290UmVuZGVyZXIpCiAgICAgcmV0dXJuIGNsb25lZFN0eWxlOwogfQogCi1zdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiByb290Qm94Rmlyc3RMaW5lU3R5bGUoY29uc3QgUmVu ZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKK3N0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5 bGU+IGZpcnN0TGluZVN0eWxlRm9yKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCiB7Ci0j aWYgQ0FOX1VTRV9GSVJTVF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICBhdXRvJiBmaXJzdExpbmVT dHlsZSA9IHJvb3RSZW5kZXJlci5maXJzdExpbmVTdHlsZSgpOwotICAgIGlmIChyb290UmVuZGVy ZXIuc3R5bGUoKSA9PSBmaXJzdExpbmVTdHlsZSkKKyAgICBhdXRvJiBmaXJzdExpbmVTdHlsZSA9 IHJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCk7CisgICAgaWYgKCZyZW5kZXJlci5zdHlsZSgpID09 ICZmaXJzdExpbmVTdHlsZSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICBhdXRvIGNsb25lZFN0 eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lUHRyKGZpcnN0TGluZVN0eWxlKTsKLSAgICBpZiAoaXM8 UmVuZGVyQmxvY2tGbG93Pihyb290UmVuZGVyZXIpKQotICAgICAgICBjbG9uZWRTdHlsZS0+c2V0 RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwotICAgIHJldHVybiBjbG9uZWRT dHlsZTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHJvb3RSZW5kZXJlcik7Ci0gICAgcmV0dXJu IHsgfTsKLSNlbmRpZgorICAgIHJldHVybiBSZW5kZXJTdHlsZTo6Y2xvbmVQdHIoZmlyc3RMaW5l U3R5bGUpOwogfQogCiBCb3hUcmVlOjpCb3hUcmVlKFJlbmRlckJsb2NrJiByb290UmVuZGVyZXIp CiAgICAgOiBtX3Jvb3RSZW5kZXJlcihyb290UmVuZGVyZXIpCi0gICAgLCBtX3Jvb3QoTGF5b3V0 OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5l cmljRWxlbWVudCB9LCByb290Qm94U3R5bGUocm9vdFJlbmRlcmVyKSwgcm9vdEJveEZpcnN0TGlu ZVN0eWxlKHJvb3RSZW5kZXJlcikpCisgICAgLCBtX3Jvb3QoTGF5b3V0OjpCb3g6OkVsZW1lbnRB dHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCBy b290Qm94U3R5bGUocm9vdFJlbmRlcmVyKSwgZmlyc3RMaW5lU3R5bGVGb3Iocm9vdFJlbmRlcmVy KSkKIHsKICAgICBpZiAocm9vdFJlbmRlcmVyLmlzQW5vbnltb3VzKCkpCiAgICAgICAgIG1fcm9v dC5zZXRJc0Fub255bW91cygpOwpAQCAtMTA3LDExICs5NCw4IEBAIEJveFRyZWU6OkJveFRyZWUo UmVuZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKIHZvaWQgQm94VHJlZTo6YnVpbGRUcmVlRm9ySW5s aW5lQ29udGVudCgpCiB7CiAgICAgYXV0byBjcmVhdGVDaGlsZEJveCA9IFsmXShSZW5kZXJPYmpl Y3QmIGNoaWxkUmVuZGVyZXIpIC0+IHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ6OkJveD4gewotICAg ICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IGZpcnN0TGluZVN0eWxlOwotI2lmIENB Tl9VU0VfRklSU1RfTElORV9TVFlMRV9SRVNPTFZFCi0gICAgICAgIGlmICgmY2hpbGRSZW5kZXJl ci5zdHlsZSgpICE9ICZjaGlsZFJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCkpCi0gICAgICAgICAg ICBmaXJzdExpbmVTdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZVB0cihjaGlsZFJlbmRlcmVyLmZp cnN0TGluZVN0eWxlKCkpOwotI2VuZGlmCisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJT dHlsZT4gZmlyc3RMaW5lU3R5bGUgPSBmaXJzdExpbmVTdHlsZUZvcihjaGlsZFJlbmRlcmVyKTsK KwogICAgICAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4oY2hpbGRSZW5kZXJlcikpIHsKICAgICAg ICAgICAgIC8vIFRoaXMgZW5zdXJlcyB0aGF0IElubGluZVRleHRCb3ggKHNlZSBiZWxvdykgYWx3 YXlzIGhhcyB1cHRvZGF0ZSBjb3VudGVyIHRleHQgKG5vdGUgdGhhdCBSZW5kZXJDb3VudGVyIGlz IGEgdHlwZSBvZiBSZW5kZXJUZXh0KS4KICAgICAgICAgICAgIGlmIChjaGlsZFJlbmRlcmVyLnBy ZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKSB7CkBAIC0yMzYsMjQgKzIyMCwxNSBAQCB2b2lk IEJveFRyZWU6OnVwZGF0ZVN0eWxlKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJl cikKIHsKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsYXlvdXRCb3hGb3JSZW5kZXJlcihyZW5kZXJl cik7CiAgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci5zdHlsZSgpOwotICAgIGF1dG8gZmlyc3RM aW5lU3R5bGUgPSBbJl0gKCkgLT4gc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiB7Ci0jaWYg Q0FOX1VTRV9GSVJTVF9MSU5FX1NUWUxFX1JFU09MVkUKLSAgICAgICAgaWYgKCZyZW5kZXJlci5z dHlsZSgpICE9ICZyZW5kZXJlci5maXJzdExpbmVTdHlsZSgpKQotICAgICAgICAgICAgcmV0dXJu IFJlbmRlclN0eWxlOjpjbG9uZVB0cihyZW5kZXJlci5maXJzdExpbmVTdHlsZSgpKTsKLSAgICAg ICAgcmV0dXJuIG51bGxwdHI7Ci0jZWxzZQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSNlbmRp ZgotICAgIH07CiAKICAgICBpZiAoJmxheW91dEJveCA9PSAmcm9vdExheW91dEJveCgpKQotICAg ICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUocm9vdEJveFN0eWxlKGRvd25jYXN0PFJlbmRlckJs b2NrPihyZW5kZXJlcikpLCByb290Qm94Rmlyc3RMaW5lU3R5bGUoZG93bmNhc3Q8UmVuZGVyQmxv Y2s+KHJlbmRlcmVyKSkpOworICAgICAgICBsYXlvdXRCb3gudXBkYXRlU3R5bGUocm9vdEJveFN0 eWxlKGRvd25jYXN0PFJlbmRlckJsb2NrPihyZW5kZXJlcikpLCBmaXJzdExpbmVTdHlsZUZvcihy ZW5kZXJlcikpOwogICAgIGVsc2UKLSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0eWxl LCBmaXJzdExpbmVTdHlsZSgpKTsKKyAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHN0eWxl LCBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcikpOwogCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9 IGxheW91dEJveC5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGlu ZygpKSB7CiAgICAgICAgIGlmIChjaGlsZC0+aXNJbmxpbmVUZXh0Qm94KCkpCi0gICAgICAgICAg ICBjaGlsZC0+dXBkYXRlU3R5bGUoUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0 aERpc3BsYXkoc3R5bGUsIERpc3BsYXlUeXBlOjpJbmxpbmUpLCBmaXJzdExpbmVTdHlsZSgpKTsK KyAgICAgICAgICAgIGNoaWxkLT51cGRhdGVTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnlt b3VzU3R5bGVXaXRoRGlzcGxheShzdHlsZSwgRGlzcGxheVR5cGU6OklubGluZSksIGZpcnN0TGlu ZVN0eWxlRm9yKHJlbmRlcmVyKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGlu ZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA1MGFkNzc5 MzkwNGEuLjk5NTE2ZjU4Njc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0xMTcsNiArMTE3LDggQEAgdm9p ZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6SW5saW5l Rm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAgLy8gQ29sbGVjdCBvdmVyZmxvdyBmcm9tIGJv eGVzLgogICAgICAgICBmb3IgKDsgYm94SW5kZXggPCBib3hlcy5zaXplKCkgJiYgYm94ZXNbYm94 SW5kZXhdLmxpbmVJbmRleCgpID09IGxpbmVJbmRleDsgKytib3hJbmRleCkgewogICAgICAgICAg ICAgYXV0byYgYm94ID0gYm94ZXNbYm94SW5kZXhdOworICAgICAgICAgICAgaWYgKGJveC5pc1Jv b3RJbmxpbmVCb3goKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAg bGluZUlua092ZXJmbG93UmVjdC51bml0ZShib3guaW5rT3ZlcmZsb3coKSk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCmluZGV4IDIzZDlhZWMx YzdmZi4uYzUzMzM0NTRlN2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEJveC5jcHAKQEAgLTgzLDggKzgzLDggQEAgYm9vbCBCb3g6OmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogewogICAgIC8vIFdlIG5lZWQgdGhlIGZpbmFsIHRy ZWUgc3RydWN0dXJlIHRvIHRlbGwgd2hldGhlciBhIGJveCBlc3RhYmxpc2hlcyBhIGNlcnRhaW4g Zm9ybWF0dGluZyBjb250ZXh0LiAKICAgICBBU1NFUlQoIVBoYXNlOjppc0luVHJlZUJ1aWxkaW5n KCkpOwotICAgIHJldHVybiBlc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKQotICAg ICAgICB8fCBlc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkKKyAgICByZXR1cm4g ZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpCisgICAgICAgIHx8IGVzdGFibGlz aGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpCiAgICAgICAgIHx8IGVzdGFibGlzaGVzVGFibGVG b3JtYXR0aW5nQ29udGV4dCgpCiAgICAgICAgIHx8IGVzdGFibGlzaGVzRmxleEZvcm1hdHRpbmdD b250ZXh0KCkKICAgICAgICAgfHwgZXN0YWJsaXNoZXNJbmRlcGVuZGVudEZvcm1hdHRpbmdDb250 ZXh0KCk7CkBAIC05Miw5ICs5Miw2IEBAIGJvb2wgQm94Ojplc3RhYmxpc2hlc0Zvcm1hdHRpbmdD b250ZXh0KCkgY29uc3QKIAogYm9vbCBCb3g6OmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29u dGV4dCgpIGNvbnN0CiB7Ci0gICAgaWYgKGlzSW50ZWdyYXRpb25Sb290KCkpCi0gICAgICAgIHJl dHVybiB0cnVlOwotCiAgICAgLy8gSUNCIGFsd2F5cyBjcmVhdGVzIGEgbmV3IChpbml0YWwpIGJs b2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBpZiAoaXM8SW5pdGlhbENvbnRhaW5pbmdCbG9j az4oKnRoaXMpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTEyNyw2ICsxMjQsOSBAQCBib29s IEJveDo6ZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QKIAogYm9vbCBC b3g6OmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogeworICAgIGlm IChpc0ludGVncmF0aW9uUm9vdCgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIC8vIDku NC4yIElubGluZSBmb3JtYXR0aW5nIGNvbnRleHRzCiAgICAgLy8gQW4gaW5saW5lIGZvcm1hdHRp bmcgY29udGV4dCBpcyBlc3RhYmxpc2hlZCBieSBhIGJsb2NrIGNvbnRhaW5lciBib3ggdGhhdCBj b250YWlucyBubyBibG9jay1sZXZlbCBib3hlcy4KICAgICBpZiAoIWlzQmxvY2tDb250YWluZXIo KSkK