233260 2021-11-17 10:25:34 -0800 REGRESSION(r285934): Broke Windows build 2021-11-17 10:46:43 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233248 1 commit-queue commit-queue andresg_22 cfleizach cgarcia webkit-bug-importer oldest_to_newest 1815997 0 commit-queue 2021-11-17 10:25:34 -0800 https://commits.webkit.org/r285934 introduced a regression: Broke Windows build This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1815999 1 444533 commit-queue 2021-11-17 10:25:43 -0800 Created attachment 444533 REVERT of r285934 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1816007 2 ews-feeder 2021-11-17 10:44:21 -0800 Committed r285935 (244344@main): <https://commits.webkit.org/244344@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444533. 1816010 3 webkit-bug-importer 2021-11-17 10:46:43 -0800 <rdar://problem/85511449> 444533 2021-11-17 10:25:43 -0800 2021-11-17 10:44:22 -0800 REVERT of r285934 bug-233260-20211117102543.patch text/plain 26612 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5NmVjZWI5MDljNjBj YmU3ZTY5N2EyNDE5YzQzODMxMTZmOTcyYi4uYjY1OWNhYWE5M2Y2MmZmZTU3OGI0N2IzYWUyZjNj ZTVkZWY4ZDg1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTE3ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI4NTkzNC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMzI2MAorCisgICAgICAgIEJyb2tlIFdpbmRvd3MgYnVpbGQKKworICAg ICAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIkFYOiBVc2UgT2JqZWN0SWRlbnRp ZmllciBmb3IgQVhJRCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMzI0OAorICAgICAgICBodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy9yMjg1OTM0 CisKIDIwMjEtMTEtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIEFYOiBVc2UgT2JqZWN0SWRlbnRpZmllciBmb3IgQVhJRApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCA2MTNiZmVkNDRmNWRmYzZmMThj ZTNkM2UwOWM3MWE4ZjY5MmExMzViLi4zMDM2NjY2MzdiMjBmOTAwY2U5N2U1OTExYWZhMjU3MmZh YzI4MmFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcApAQCAt NTAyLDcgKzUwMiw3IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFt LCBjb25zdCBBWENvcmVPYmplY3QmIG9iamVjdCkKICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJh ZGRyZXNzIiwgJm9iamVjdCk7CiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgid3JhcHBlciIsIG9i amVjdC53cmFwcGVyKCkpOwogCi0gICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgicGFyZW50T2JqZWN0 IiwgcGFyZW50ID8gcGFyZW50LT5vYmplY3RJRCgpIDogQVhJRCgpKTsKKyAgICBzdHJlYW0uZHVt cFByb3BlcnR5KCJwYXJlbnRPYmplY3QiLCBwYXJlbnQgPyBwYXJlbnQtPm9iamVjdElEKCkgOiAw KTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJyZW1vdGVQ YXJlbnRPYmplY3QiLCBvYmplY3QucmVtb3RlUGFyZW50T2JqZWN0KCkpOwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCA1ZDY0 MTY2NDRlZDIwOThlY2FlYzgyM2RkNTQyMjZkMTFiNDU5OGExLi40NDkzZjYwOTUyN2JlMGZiMjdh NmQ5NTA0Yjg2YWUwYzliYTkxOTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTEyNCw2ICsxMjQsOCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKK2NvbnN0IEFYSUQgSW52YWxpZEFY SUQgPSAwOworCiAvLyBQb3N0IHZhbHVlIGNoYW5nZSBub3RpZmljYXRpb25zIGZvciBwYXNzd29y ZCBmaWVsZHMgb3IgZWxlbWVudHMgY29udGFpbmVkIGluIHBhc3N3b3JkIGZpZWxkcyBhdCBhIDQw aHogaW50ZXJ2YWwgdG8gdGh3YXJ0IGFuYWx5c2lzIG9mIHR5cGluZyBjYWRlbmNlCiBzdGF0aWMg Y29uc3QgU2Vjb25kcyBhY2Nlc3NpYmlsaXR5UGFzc3dvcmRWYWx1ZUNoYW5nZU5vdGlmaWNhdGlv bkludGVydmFsIHsgMjVfbXMgfTsKIHN0YXRpYyBjb25zdCBTZWNvbmRzIGFjY2Vzc2liaWxpdHlM aXZlUmVnaW9uQ2hhbmdlZE5vdGlmaWNhdGlvbkludGVydmFsIHsgMjBfbXMgfTsKQEAgLTQxNiw3 ICs0MTgsNyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmpl Y3QoTm9kZSogZm9jdXNlZE5vZGUpCiAgICAgYXV0byogZm9jdXMgPSBnZXRPckNyZWF0ZShmb2N1 c2VkTm9kZSk7CiAKICAgICBpZiAoYXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JQ YWdlSUQoKm1fcGFnZUlEKSkKLSAgICAgICAgdHJlZS0+c2V0Rm9jdXNlZE5vZGVJRChmb2N1cyA/ IGZvY3VzLT5vYmplY3RJRCgpIDogQVhJRCgpKTsKKyAgICAgICAgdHJlZS0+c2V0Rm9jdXNlZE5v ZGVJRChmb2N1cyA/IGZvY3VzLT5vYmplY3RJRCgpIDogSW52YWxpZEFYSUQpOwogfQogI2VuZGlm CiAKQEAgLTQyNiw3ICs0MjgsNyBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hl OjpnZXQoV2lkZ2V0KiB3aWRnZXQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAK ICAgICBBWElEIGF4SUQgPSBtX3dpZGdldE9iamVjdE1hcHBpbmcuZ2V0KHdpZGdldCk7Ci0gICAg QVNTRVJUKCFheElELmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkpOworICAgIEFTU0VSVCghSGFz aFRyYWl0czxBWElEPjo6aXNEZWxldGVkVmFsdWUoYXhJRCkpOwogICAgIGlmICghYXhJRCkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgCkBAIC00MzksNyArNDQxLDcgQEAgQWNjZXNzaWJp bGl0eU9iamVjdCogQVhPYmplY3RDYWNoZTo6Z2V0KFJlbmRlck9iamVjdCogcmVuZGVyZXIpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwogICAgIAogICAgIEFYSUQgYXhJRCA9IG1fcmVuZGVyT2Jq ZWN0TWFwcGluZy5nZXQocmVuZGVyZXIpOwotICAgIEFTU0VSVCghYXhJRC5pc0hhc2hUYWJsZURl bGV0ZWRWYWx1ZSgpKTsKKyAgICBBU1NFUlQoIUhhc2hUcmFpdHM8QVhJRD46OmlzRGVsZXRlZFZh bHVlKGF4SUQpKTsKICAgICBpZiAoIWF4SUQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBA IC00NTEsMTEgKzQ1MywxMSBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpn ZXQoTm9kZSogbm9kZSkKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwog Ci0gICAgQVhJRCByZW5kZXJJRCA9IG5vZGUtPnJlbmRlcmVyKCkgPyBtX3JlbmRlck9iamVjdE1h cHBpbmcuZ2V0KG5vZGUtPnJlbmRlcmVyKCkpIDogQVhJRCgpOwotICAgIEFTU0VSVCghcmVuZGVy SUQuaXNIYXNoVGFibGVEZWxldGVkVmFsdWUoKSk7CisgICAgQVhJRCByZW5kZXJJRCA9IG5vZGUt PnJlbmRlcmVyKCkgPyBtX3JlbmRlck9iamVjdE1hcHBpbmcuZ2V0KG5vZGUtPnJlbmRlcmVyKCkp IDogMDsKKyAgICBBU1NFUlQoIUhhc2hUcmFpdHM8QVhJRD46OmlzRGVsZXRlZFZhbHVlKHJlbmRl cklEKSk7CiAKICAgICBBWElEIG5vZGVJRCA9IG1fbm9kZU9iamVjdE1hcHBpbmcuZ2V0KG5vZGUp OwotICAgIEFTU0VSVCghbm9kZUlELmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkpOworICAgIEFT U0VSVCghSGFzaFRyYWl0czxBWElEPjo6aXNEZWxldGVkVmFsdWUobm9kZUlEKSk7CiAKICAgICBp ZiAobm9kZS0+cmVuZGVyZXIoKSAmJiBub2RlSUQgJiYgIXJlbmRlcklEKSB7CiAgICAgICAgIC8v IFRoaXMgY2FuIGhhcHBlbiBpZiBhbiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdCBpcyBjcmVhdGVk IGZvciBhIG5vZGUgdGhhdCdzIG5vdApAQCAtNjA5LDcgKzYxMSw3IEBAIHZvaWQgQVhPYmplY3RD YWNoZTo6Y2FjaGVBbmRJbml0aWFsaXplV3JhcHBlcihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBuZXdP YmplY3QsIERPCiB7CiAgICAgQVNTRVJUKG5ld09iamVjdCk7CiAgICAgQVhJRCBheElEID0gZ2V0 QVhJRChuZXdPYmplY3QpOwotICAgIEFTU0VSVChheElELmlzVmFsaWQoKSk7CisgICAgQVNTRVJU KGF4SUQgIT0gSW52YWxpZEFYSUQpOwogCiAgICAgV1RGOjpzd2l0Y2hPbihkb21PYmplY3QsCiAg ICAgICAgIFsmYXhJRCwgdGhpc10gKFJlbmRlck9iamVjdCogdHlwZWRWYWx1ZSkgeyBtX3JlbmRl ck9iamVjdE1hcHBpbmcuc2V0KHR5cGVkVmFsdWUsIGF4SUQpOyB9LApAQCAtODI4LDcgKzgzMCw3 IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFYT2JqZWN0Q2FjaGU6OmNyZWF0ZShBY2Nlc3NpYmls aXR5Um9sZSByb2xlKQogdm9pZCBBWE9iamVjdENhY2hlOjpyZW1vdmUoQVhJRCBheElEKQogewog ICAgIEFYVFJBQ0UoIkFYT2JqZWN0Q2FjaGU6OnJlbW92ZSIpOwotICAgIEFYTE9HKG1ha2VTdHJp bmcoIkFYSUQgIiwgYXhJRC5sb2dnaW5nU3RyaW5nKCkpKTsKKyAgICBBWExPRyhtYWtlU3RyaW5n KCJBWElEICIsIGF4SUQpKTsKIAogICAgIGlmICghYXhJRCkKICAgICAgICAgcmV0dXJuOwpAQCAt ODkzLDEwICs4OTUsMTYgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpyZW1vdmUoV2lkZ2V0KiB2aWV3 KQogI2lmICFQTEFURk9STShXSU4pCiBBWElEIEFYT2JqZWN0Q2FjaGU6OnBsYXRmb3JtR2VuZXJh dGVBWElEKCkgY29uc3QKIHsKLSAgICBBWElEIG9iaklEOworICAgIHN0YXRpYyBBWElEIGxhc3RV c2VkSUQgPSAwOworCisgICAgLy8gR2VuZXJhdGUgYSBuZXcgSUQuCisgICAgQVhJRCBvYmpJRCA9 IGxhc3RVc2VkSUQ7CiAgICAgZG8gewotICAgICAgICBvYmpJRCA9IEFYSUQ6OmdlbmVyYXRlKCk7 Ci0gICAgfSB3aGlsZSAoIW9iaklELmlzVmFsaWQoKSB8fCBtX2lkc0luVXNlLmNvbnRhaW5zKG9i aklEKSk7CisgICAgICAgICsrb2JqSUQ7CisgICAgfSB3aGlsZSAoIW9iaklEIHx8IEhhc2hUcmFp dHM8QVhJRD46OmlzRGVsZXRlZFZhbHVlKG9iaklEKSB8fCBtX2lkc0luVXNlLmNvbnRhaW5zKG9i aklEKSk7CisKKyAgICBsYXN0VXNlZElEID0gb2JqSUQ7CisKICAgICByZXR1cm4gb2JqSUQ7CiB9 CiAjZW5kaWYKQEAgLTkwNiw3ICs5MTQsNyBAQCBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+ IEFYT2JqZWN0Q2FjaGU6Om9iamVjdHNGb3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+JiBheAogICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKICAgICByZXR1cm4gYXhJRHMubWFwKFt0aGlzXSAo QVhJRCBheElEKSAtPiBSZWZQdHI8QVhDb3JlT2JqZWN0PiB7Ci0gICAgICAgIEFTU0VSVChheElE LmlzVmFsaWQoKSk7CisgICAgICAgIEFTU0VSVChheElEICE9IEludmFsaWRBWElEKTsKICAgICAg ICAgcmV0dXJuIG9iamVjdEZyb21BWElEKGF4SUQpOwogICAgIH0pOwogfQpAQCAtMzI2NCw3ICsz MjcyLDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2Jq ZWN0JiBvYmplY3QsIEFYTm90aWZpY2F0aW9uIG5vdGkKICAgICBBWExPRyhzdGQ6Om1ha2VfcGFp cigmb2JqZWN0LCBub3RpZmljYXRpb24pKTsKICAgICBBWExPRygqdGhpcyk7CiAKLSAgICBpZiAo IW1fcGFnZUlEIHx8ICFvYmplY3Qub2JqZWN0SUQoKS5pc1ZhbGlkKCkpIHsKKyAgICBpZiAoIW1f cGFnZUlEIHx8IG9iamVjdC5vYmplY3RJRCgpID09IEludmFsaWRBWElEKSB7CiAgICAgICAgIEFY TE9HKCJObyBwYWdlSUQgb3Igb2JqZWN0SUQiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAg LTMzNDQsNyArMzM1Miw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVl KGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVjCiAgICAgVmVjdG9yPHN0 ZDo6cGFpcjxSZWZQdHI8QVhDb3JlT2JqZWN0PiwgQVhOb3RpZmljYXRpb24+PiBmaWx0ZXJlZE5v dGlmaWNhdGlvbnM7CiAgICAgZm9yIChjb25zdCBhdXRvJiBub3RpZmljYXRpb24gOiBub3RpZmlj YXRpb25zKSB7CiAgICAgICAgIEFYTE9HKG5vdGlmaWNhdGlvbik7Ci0gICAgICAgIGlmICghbm90 aWZpY2F0aW9uLmZpcnN0IHx8ICFub3RpZmljYXRpb24uZmlyc3QtPm9iamVjdElEKCkuaXNWYWxp ZCgpKQorICAgICAgICBpZiAoIW5vdGlmaWNhdGlvbi5maXJzdCB8fCBub3RpZmljYXRpb24uZmly c3QtPm9iamVjdElEKCkgPT0gSW52YWxpZEFYSUQpCiAgICAgICAgICAgICBjb250aW51ZTsKIAog ICAgICAgICBzd2l0Y2ggKG5vdGlmaWNhdGlvbi5zZWNvbmQpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXggZGQ5YzljZGQyZTA2MDYzOTE2Y2Ux NzYzNjBmOWUxMjEwZWI1MDQzOS4uM2I3NzI0YzgyODUyYWZiZDU2ODZlMDA1MzYyZjhmYTgzMjNm ZWUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgK QEAgLTYwLDcgKzYwLDcgQEAgY2xhc3MgVmlzaWJsZVBvc2l0aW9uOwogY2xhc3MgV2lkZ2V0Owog CiBzdHJ1Y3QgVGV4dE1hcmtlckRhdGEgewotICAgIEFYSUQgYXhJRDsKKyAgICBBWElEIGF4SUQg eyAwIH07CiAKICAgICBOb2RlKiBub2RlIHsgbnVsbHB0ciB9OwogICAgIHVuc2lnbmVkIG9mZnNl dCB7IDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmgKaW5kZXggMjFmZjRhMjhhNWE2NGE4MTQxNzEyMzNhODE2NGVjM2FlNTZjMjA5 Zi4uZTkxMzRkYWQwZGY5ZDBmNWQ4NzYxZWU5NmEzNzlhNDQzNjg1MmQxZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTgy OCw3ICs4MjgsNyBAQCBwcm90ZWN0ZWQ6IC8vIEZJWE1FOiBNYWtlIHRoZSBkYXRhIG1lbWJlcnMg cHJpdmF0ZS4KICAgICBtdXRhYmxlIGJvb2wgbV9jaGlsZHJlbkluaXRpYWxpemVkIHsgZmFsc2Ug fTsKICAgICBBY2Nlc3NpYmlsaXR5Um9sZSBtX3JvbGUgeyBBY2Nlc3NpYmlsaXR5Um9sZTo6VW5r bm93biB9OwogcHJpdmF0ZToKLSAgICBBWElEIG1faWQ7CisgICAgQVhJRCBtX2lkIHsgMCB9Owog ICAgIE9wdGlvblNldDxBWEFuY2VzdG9yRmxhZz4gbV9hbmNlc3RvckZsYWdzOwogICAgIEFjY2Vz c2liaWxpdHlPYmplY3RJbmNsdXNpb24gbV9sYXN0S25vd25Jc0lnbm9yZWRWYWx1ZSB7IEFjY2Vz c2liaWxpdHlPYmplY3RJbmNsdXNpb246OkRlZmF1bHRCZWhhdmlvciB9OwogcHJvdGVjdGVkOiAv LyBGSVhNRTogTWFrZSB0aGUgZGF0YSBtZW1iZXJzIHByaXZhdGUuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFj ZS5oCmluZGV4IGUxNTk2MjFjODU0OTZkYmJiN2IyNTc3ZWY2ZWZjNzk0ZGU1ZDc0ZjQuLmNhOWEw Y2ViZDJmYjNlY2NjMjMyZTMwOGJiMGI2ZGJiNWYyMjU4ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFj ZS5oCkBAIC0zNiw3ICszNiw2IEBACiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8dmFy aWFudD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgotI2luY2x1ZGUgPHd0Zi9PYmplY3RJZGVu dGlmaWVyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAogI2lmIFBMQVRGT1JNKFdJ TikKQEAgLTk0LDggKzkzLDggQEAgY2xhc3MgU2Nyb2xsVmlldzsKIHN0cnVjdCBBY2Nlc3NpYmls aXR5VGV4dDsKIHN0cnVjdCBTY3JvbGxSZWN0VG9WaXNpYmxlT3B0aW9uczsKIAotZW51bSBBWElE VHlwZSB7IH07Ci11c2luZyBBWElEID0gT2JqZWN0SWRlbnRpZmllcjxBWElEVHlwZT47Cit1c2lu ZyBBWElEID0gc2l6ZV90OworZXh0ZXJuIGNvbnN0IEFYSUQgSW52YWxpZEFYSUQ7CiAKIGVudW0g Y2xhc3MgQVhBbmNlc3RvckZsYWcgOiB1aW50OF90IHsKICAgICAvLyBXaGVuIHRoZSBmbGFncyBh cmVuJ3QgaW5pdGlhbGl6ZWQsIGl0IG1lYW5zIHRoZSBvYmplY3QgaGFzbid0IGJlZW4gaW5zZXJ0 ZWQgaW50byB0aGUgdHJlZSwKQEAgLTE1ODMsNyArMTU4Miw3IEBAIGlubGluZSB2b2lkIEFYQ29y ZU9iamVjdDo6ZGV0YWNoKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSBkZXRhY2htZW50VHlw ZSkKIHsKICAgICBkZXRhY2hXcmFwcGVyKGRldGFjaG1lbnRUeXBlKTsKICAgICBkZXRhY2hSZW1v dGVQYXJ0cyhkZXRhY2htZW50VHlwZSk7Ci0gICAgc2V0T2JqZWN0SUQoeyB9KTsKKyAgICBzZXRP YmplY3RJRChJbnZhbGlkQVhJRCk7CiB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0 eU9iamVjdEF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNj ZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcAppbmRleCAzM2Y5YzFlNTQ5Y2RhMzdmMTVlYjU3OGNk ZWViZDgxMGQwMDkxOGE0Li43MDNjOTc4M2M4MjBiZDRjOGYwYzk5YjNhZDJjNjE4NjY5YjFiOWZl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2li aWxpdHlPYmplY3RBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9h dHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCkBAIC00MzksNyArNDM5LDcgQEAgR0RC dXNJbnRlcmZhY2VWVGFibGUgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpzX2FjY2Vzc2libGVG dW5jdGlvbnMgPSB7CiAgICAgICAgIGlmICghZ19zdHJjbXAwKHByb3BlcnR5TmFtZSwgIkxvY2Fs ZSIpKQogICAgICAgICAgICAgcmV0dXJuIGdfdmFyaWFudF9uZXdfc3RyaW5nKHNldGxvY2FsZShM Q19NRVNTQUdFUywgbnVsbHB0cikpOwogICAgICAgICBpZiAoIWdfc3RyY21wMChwcm9wZXJ0eU5h bWUsICJBY2Nlc3NpYmxlSWQiKSkKLSAgICAgICAgICAgIHJldHVybiBnX3ZhcmlhbnRfbmV3X3N0 cmluZyhhdHNwaU9iamVjdC0+bV9heE9iamVjdCA/IFN0cmluZzo6bnVtYmVyKGF0c3BpT2JqZWN0 LT5tX2F4T2JqZWN0LT5vYmplY3RJRCgpLnRvVUludDY0KCkpLnV0ZjgoKS5kYXRhKCkgOiAiIik7 CisgICAgICAgICAgICByZXR1cm4gZ192YXJpYW50X25ld19zdHJpbmcoYXRzcGlPYmplY3QtPm1f YXhPYmplY3QgPyBTdHJpbmc6Om51bWJlcihhdHNwaU9iamVjdC0+bV9heE9iamVjdC0+b2JqZWN0 SUQoKSkudXRmOCgpLmRhdGEoKSA6ICIiKTsKICAgICAgICAgaWYgKCFnX3N0cmNtcDAocHJvcGVy dHlOYW1lLCAiUGFyZW50IikpCiAgICAgICAgICAgICByZXR1cm4gYXRzcGlPYmplY3QtPnBhcmVu dFJlZmVyZW5jZSgpOwogICAgICAgICBpZiAoIWdfc3RyY21wMChwcm9wZXJ0eU5hbWUsICJDaGls ZENvdW50IikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDExYTc5YjEyMTcyZDdh MDhkZmRkYzFiNWZjMzEzOTdmMjJjNzNiNDIuLjE3MzZmZTBmMDgwNDM2YzI2YjRhNzNlNWQwZTMx NWUyYmUwMmQ5MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC00NCw4ICs0NCw4 IEBAIEFYSXNvbGF0ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QoQVhDb3JlT2JqZWN0JiBvYmpl Y3QsIEFYSXNvbGF0ZWRUcmVlKiB0cmVlLCBBCiAgICAgLCBtX2lkKG9iamVjdC5vYmplY3RJRCgp KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgaWYgKG1faWQuaXNWYWxpZCgp KQotICAgICAgICBpbml0aWFsaXplQXR0cmlidXRlRGF0YShvYmplY3QsICFwYXJlbnRJRC5pc1Zh bGlkKCkpOworICAgIGlmIChtX2lkICE9IEludmFsaWRBWElEKQorICAgICAgICBpbml0aWFsaXpl QXR0cmlidXRlRGF0YShvYmplY3QsIHBhcmVudElEID09IEludmFsaWRBWElEKTsKICAgICBlbHNl IHsKICAgICAgICAgLy8gU2hvdWxkIG5ldmVyIGhhcHBlbiB1bmRlciBub3JtYWwgY2lyY3Vtc3Rh bmNlcy4KICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC00MzgsNyArNDM4LDcgQEAg QVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojphc3NvY2lhdGVkQVhPYmplY3QoKSBjb25z dAogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKLSAgICBpZiAoIW1faWQuaXNWYWxp ZCgpKQorICAgIGlmIChtX2lkID09IEludmFsaWRBWElEKQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAogICAgIGlmIChhdXRvKiBheE9iamVjdENhY2hlID0gdGhpcy0+YXhPYmplY3RDYWNoZSgp KSB7CkBAIC01MjksNyArNTI5LDcgQEAgYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojppc0RldGFjaGVk KCkgY29uc3QKIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpkZXRhY2hGcm9tUGFyZW50KCkKIHsK LSAgICBtX3BhcmVudElEID0geyB9OworICAgIG1fcGFyZW50SUQgPSBJbnZhbGlkQVhJRDsKIH0K IAogY29uc3QgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIEFYSXNv bGF0ZWRPYmplY3Q6OmNoaWxkcmVuKGJvb2wpCkBAIC01ODcsNyArNTg3LDcgQEAgQVhDb3JlT2Jq ZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQVhJc29sYXRlZE9iamVjdDo6Y29udGVu dHMoKQogCiBib29sIEFYSXNvbGF0ZWRPYmplY3Q6OmlzRGV0YWNoZWRGcm9tUGFyZW50KCkKIHsK LSAgICBpZiAocGFyZW50KCkuaXNWYWxpZCgpKQorICAgIGlmIChwYXJlbnQoKSAhPSBJbnZhbGlk QVhJRCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gQ2hlY2sgd2hldGhlciB0aGlz IGlzIHRoZSByb290IG5vZGUsIGluIHdoaWNoIGNhc2Ugd2Ugc2hvdWxkIHJldHVybiBmYWxzZS4K QEAgLTYwMyw3ICs2MDMsNyBAQCBBWENvcmVPYmplY3QqIEFYSXNvbGF0ZWRPYmplY3Q6OmNlbGxG b3JDb2x1bW5BbmRSb3codW5zaWduZWQgY29sdW1uSW5kZXgsIHVuc2lnbgogICAgICAgICAgICAg aWYgKGF1dG8gY2VsbCA9IG9iamVjdC0+Y2VsbEZvckNvbHVtbkFuZFJvdyhjb2x1bW5JbmRleCwg cm93SW5kZXgpKQogICAgICAgICAgICAgICAgIHJldHVybiBjZWxsLT5vYmplY3RJRCgpOwogICAg ICAgICB9Ci0gICAgICAgIHJldHVybiB7IH07CisgICAgICAgIHJldHVybiBJbnZhbGlkQVhJRDsK ICAgICB9KTsKIAogICAgIHJldHVybiB0cmVlKCktPm5vZGVGb3JJRChjZWxsSUQpLmdldCgpOwpA QCAtODEwLDcgKzgxMCw3IEBAIEFYQ29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6YWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGF4T2JqZWN0LT5vYmplY3RJRCgpOwogICAgICAgICB9CiAKLSAgICAgICAgcmV0 dXJuIHsgfTsKKyAgICAgICAgcmV0dXJuIEludmFsaWRBWElEOwogICAgIH0pOwogCiAgICAgcmV0 dXJuIHRyZWUoKS0+bm9kZUZvcklEKGF4SUQpLmdldCgpOwpAQCAtODMwLDcgKzgzMCw3IEBAIEFY Q29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6b2JqZWN0QXR0cmlidXRlVmFsdWUoQVhQcm9w ZXJ0eU5hbWUgcHJvcGVydHlOYW1lCiAgICAgYXV0byB2YWx1ZSA9IG1fcHJvcGVydHlNYXAuZ2V0 KHByb3BlcnR5TmFtZSk7CiAgICAgQVhJRCBub2RlSUQgPSBXVEY6OnN3aXRjaE9uKHZhbHVlLAog ICAgICAgICBbXSAoQVhJRCYgdHlwZWRWYWx1ZSkgLT4gQVhJRCB7IHJldHVybiB0eXBlZFZhbHVl OyB9LAotICAgICAgICBbXSAoYXV0byYpIHsgcmV0dXJuIEFYSUQoKTsgfQorICAgICAgICBbXSAo YXV0byYpIHsgcmV0dXJuIEludmFsaWRBWElEOyB9CiAgICAgKTsKIAogICAgIHJldHVybiB0cmVl KCktPm5vZGVGb3JJRChub2RlSUQpLmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4 IDNiNGVlYTFmYmI1ODc3YTNjNDY4ODExYjQ0ZDA4ZGVhNGYxMGZhMDcuLjY5MjkzNWE5NzRmNDMx ZGI4MDgzZmE4NWIyNWU3M2U0ZWJiM2ExMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAg LTY2Nyw4ICs2NjcsOCBAQCBwcml2YXRlOgogICAgIFN0cmluZyBvdXRlckhUTUwoKSBjb25zdCBv dmVycmlkZTsKIAogICAgIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gbV9jYWNoZWRUcmVlOwotICAg IEFYSUQgbV9wYXJlbnRJRDsKLSAgICBBWElEIG1faWQ7CisgICAgQVhJRCBtX3BhcmVudElEIHsg SW52YWxpZEFYSUQgfTsKKyAgICBBWElEIG1faWQgeyBJbnZhbGlkQVhJRCB9OwogICAgIFZlY3Rv cjxBWElEPiBtX2NoaWxkcmVuSURzOwogICAgIFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4g bV9jaGlsZHJlbjsKICAgICBBWFByb3BlcnR5TWFwIG1fcHJvcGVydHlNYXA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5jcHAKaW5kZXggYmVhY2VjNThlNmVhYmZlYzAxM2NkMjM0ZjZiZjQ1YTc0ZGI4NjI0 Ny4uOGVjOTEzYjljMWVlOGI5YjA5ZjUwOTc3ZmFlZTFkOTkyZmVlOTBkOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmNwcApAQCAtMTQ2LDcgKzE0Niw3IEBAIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0 PiBBWElzb2xhdGVkVHJlZTo6bm9kZUZvcklEKEFYSUQgYXhJRCkgY29uc3QKICAgICBpZiAobV91 c2VkT25BWFRocmVhZCAmJiBpc01haW5UaHJlYWQoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKLSAgICByZXR1cm4gYXhJRC5pc1ZhbGlkKCkgPyBtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0 KGF4SUQpIDogbnVsbHB0cjsKKyAgICByZXR1cm4gYXhJRCAhPSBJbnZhbGlkQVhJRCA/IG1fcmVh ZGVyVGhyZWFkTm9kZU1hcC5nZXQoYXhJRCkgOiBudWxscHRyOwogfQogCiBWZWN0b3I8UmVmUHRy PEFYQ29yZU9iamVjdD4+IEFYSXNvbGF0ZWRUcmVlOjpvYmplY3RzRm9ySURzKGNvbnN0IFZlY3Rv cjxBWElEPiYgYXhJRHMpIGNvbnN0CkBAIC0xNjYsNyArMTY2LDcgQEAgVmVjdG9yPFJlZlB0cjxB WENvcmVPYmplY3Q+PiBBWElzb2xhdGVkVHJlZTo6b2JqZWN0c0ZvcklEcyhjb25zdCBWZWN0b3I8 QVhJRD4mIGEKIFZlY3RvcjxBWElEPiBBWElzb2xhdGVkVHJlZTo6aWRzRm9yT2JqZWN0cyhjb25z dCBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+JiBvYmplY3RzKSBjb25zdAogewogICAgIHJl dHVybiBvYmplY3RzLm1hcChbXSAoY29uc3QgUmVmUHRyPEFYQ29yZU9iamVjdD4mIG9iamVjdCkg LT4gQVhJRCB7Ci0gICAgICAgIHJldHVybiBvYmplY3QgPyBvYmplY3QtPm9iamVjdElEKCkgOiBB WElEKCk7CisgICAgICAgIHJldHVybiBvYmplY3QgPyBvYmplY3QtPm9iamVjdElEKCkgOiBJbnZh bGlkQVhJRDsKICAgICB9KTsKIH0KIApAQCAtMTc1LDcgKzE3NSw3IEBAIHZvaWQgQVhJc29sYXRl ZFRyZWU6OnVwZGF0ZUNoaWxkcmVuSURzKEFYSUQgYXhJRCwgVmVjdG9yPEFYSUQ+JiYgY2hpbGRy ZW5JRHMpCiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9jaGFuZ2VM b2dMb2NrLmlzTG9ja2VkKCkpOwogCi0gICAgaWYgKGF4SUQuaXNWYWxpZCgpKSB7CisgICAgaWYg KGF4SUQgIT0gSW52YWxpZEFYSUQpIHsKICAgICAgICAgbV9ub2RlTWFwLnNldChheElELCBjaGls ZHJlbklEcyk7CiAgICAgICAgIG1fcGVuZGluZ0NoaWxkcmVuVXBkYXRlcy5hcHBlbmQoc3RkOjpt YWtlX3BhaXIoYXhJRCwgV1RGTW92ZShjaGlsZHJlbklEcykpKTsKICAgICB9CkBAIC0xODYsMTQg KzE4NiwxNCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpnZW5lcmF0ZVN1YnRyZWUoQVhDb3JlT2Jq ZWN0JiBheE9iamVjdCwgQVhDb3JlT2JqZWN0KiBheFBhcgogICAgIEFYVFJBQ0UoIkFYSXNvbGF0 ZWRUcmVlOjpnZW5lcmF0ZVN1YnRyZWUiKTsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog Ci0gICAgaWYgKCFheE9iamVjdC5vYmplY3RJRCgpLmlzVmFsaWQoKSkKKyAgICBpZiAoYXhPYmpl Y3Qub2JqZWN0SUQoKSA9PSBJbnZhbGlkQVhJRCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0 byBvYmplY3QgPSBjcmVhdGVTdWJ0cmVlKGF4T2JqZWN0LCBheFBhcmVudCA/IGF4UGFyZW50LT5v YmplY3RJRCgpIDogQVhJRCgpLCBhdHRhY2hXcmFwcGVyKTsKKyAgICBhdXRvIG9iamVjdCA9IGNy ZWF0ZVN1YnRyZWUoYXhPYmplY3QsIGF4UGFyZW50ID8gYXhQYXJlbnQtPm9iamVjdElEKCkgOiBJ bnZhbGlkQVhJRCwgYXR0YWNoV3JhcHBlcik7CiAgICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdl TG9nTG9jayB9OwogICAgIGlmICghYXhQYXJlbnQpCiAgICAgICAgIHNldFJvb3ROb2RlKG9iamVj dC5wdHIoKSk7Ci0gICAgZWxzZSBpZiAoYXhQYXJlbnQtPm9iamVjdElEKCkuaXNWYWxpZCgpKSAv LyBOZWVkIHRvIGNoZWNrIGZvciB0aGUgb2JqZWN0SUQgb2YgYXhQYXJlbnQgYWdhaW4gYmVjYXVz ZSBpdCBtYXkgaGF2ZSBiZWVuIGRldGFjaGVkIHdoaWxlIHRyYXZlcnNpbmcgdGhlIHRyZWUuCisg ICAgZWxzZSBpZiAoYXhQYXJlbnQtPm9iamVjdElEKCkgIT0gSW52YWxpZEFYSUQpIC8vIE5lZWQg dG8gY2hlY2sgZm9yIHRoZSBvYmplY3RJRCBvZiBheFBhcmVudCBhZ2FpbiBiZWNhdXNlIGl0IG1h eSBoYXZlIGJlZW4gZGV0YWNoZWQgd2hpbGUgdHJhdmVyc2luZyB0aGUgdHJlZS4KICAgICAgICAg dXBkYXRlQ2hpbGRyZW5JRHMoYXhQYXJlbnQtPm9iamVjdElEKCksIGF4UGFyZW50LT5jaGlsZHJl bklEcygpKTsKIH0KIApAQCAtMjAzLDcgKzIwMyw3IEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBB WElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElE CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIGF1dG8gb2JqZWN0ID0gQVhJc29s YXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0LCB0aGlzLCBwYXJlbnRJRCk7Ci0gICAgaWYgKCFv YmplY3QtPm9iamVjdElEKCkuaXNWYWxpZCgpKSB7CisgICAgaWYgKG9iamVjdC0+b2JqZWN0SUQo KSA9PSBJbnZhbGlkQVhJRCkgewogICAgICAgICAvLyBFaXRoZXIgdGhlIGF4T2JqZWN0IGhhcyBh biBpbnZhbGlkIElEIG9yIHNvbWV0aGluZyBlbHNlIHdlbnQgdGVycmlibHkgd3JvbmcuIERvbid0 IGJvdGhlciBkb2luZyBhbnl0aGluZyBlbHNlLgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICAgICAgcmV0dXJuIG9iamVjdDsKQEAgLTI0Miw3ICsyNDIsNyBAQCB2b2lkIEFYSXNv bGF0ZWRUcmVlOjp1cGRhdGVOb2RlKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAKICAgICBBWElE IGF4SUQgPSBheE9iamVjdC5vYmplY3RJRCgpOwogICAgIGF1dG8qIGF4UGFyZW50ID0gYXhPYmpl Y3QucGFyZW50T2JqZWN0KCk7Ci0gICAgQVhJRCBwYXJlbnRJRCA9IGF4UGFyZW50ID8gYXhQYXJl bnQtPm9iamVjdElEKCkgOiBBWElEKCk7CisgICAgQVhJRCBwYXJlbnRJRCA9IGF4UGFyZW50ID8g YXhQYXJlbnQtPm9iamVjdElEKCkgOiBJbnZhbGlkQVhJRDsKIAogICAgIGF1dG8gbmV3T2JqZWN0 ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0LCB0aGlzLCBwYXJlbnRJRCk7CiAg ICAgbmV3T2JqZWN0LT5tX2NoaWxkcmVuSURzID0gYXhPYmplY3QuY2hpbGRyZW5JRHMoKTsKQEAg LTMxNiw3ICszMTYsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENv cmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9KTsKLSAgICBpZiAoIWF4QW5jZXN0b3IgfHwgIWF4QW5jZXN0b3ItPm9iamVjdElEKCkuaXNW YWxpZCgpIHx8IGl0ZXJhdG9yID09IG1fbm9kZU1hcC5lbmQoKSkgeworICAgIGlmICghYXhBbmNl c3RvciB8fCBheEFuY2VzdG9yLT5vYmplY3RJRCgpID09IEludmFsaWRBWElEIHx8IGl0ZXJhdG9y ID09IG1fbm9kZU1hcC5lbmQoKSkgewogICAgICAgICAvLyBUaGlzIHVwZGF0ZSB0cmlnZ2VyZWQg YmVmb3JlIHRoZSBpc29sYXRlZCB0cmVlIGhhcyBiZWVuIHJlcG9wdWxhdGVkLgogICAgICAgICAv LyBSZXR1cm4gaGVyZSBzaW5jZSB0aGVyZSBpcyBub3RoaW5nIHRvIHVwZGF0ZS4KICAgICAgICAg cmV0dXJuOwpAQCAtMzY1LDcgKzM2NSw3IEBAIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBBWElz b2xhdGVkVHJlZTo6Zm9jdXNlZE5vZGUoKQogICAgIC8vIEFwcGx5IHBlbmRpbmcgY2hhbmdlcyBp biBjYXNlIGZvY3VzIGhhcyBjaGFuZ2VkIGFuZCBoYXNuJ3QgYmVlbiB1cGRhdGVkLgogICAgIGFw cGx5UGVuZGluZ0NoYW5nZXMoKTsKICAgICBMb2NrZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2Nr IH07Ci0gICAgQVhMT0cobWFrZVN0cmluZygiZm9jdXNlZE5vZGVJRCAiLCBtX2ZvY3VzZWROb2Rl SUQubG9nZ2luZ1N0cmluZygpKSk7CisgICAgQVhMT0cobWFrZVN0cmluZygiZm9jdXNlZE5vZGVJ RCAiLCBtX2ZvY3VzZWROb2RlSUQpKTsKICAgICBBWExPRygiZm9jdXNlZCBub2RlOiIpOwogICAg IEFYTE9HKG5vZGVGb3JJRChtX2ZvY3VzZWROb2RlSUQpKTsKICAgICByZXR1cm4gbm9kZUZvcklE KG1fZm9jdXNlZE5vZGVJRCk7CkBAIC0zOTIsNyArMzkyLDcgQEAgdm9pZCBBWElzb2xhdGVkVHJl ZTo6c2V0Um9vdE5vZGUoQVhJc29sYXRlZE9iamVjdCogcm9vdCkKIHZvaWQgQVhJc29sYXRlZFRy ZWU6OnNldEZvY3VzZWROb2RlSUQoQVhJRCBheElEKQogewogICAgIEFYVFJBQ0UoIkFYSXNvbGF0 ZWRUcmVlOjpzZXRGb2N1c2VkTm9kZUlEIik7Ci0gICAgQVhMT0cobWFrZVN0cmluZygiYXhJRCAi LCBheElELmxvZ2dpbmdTdHJpbmcoKSkpOworICAgIEFYTE9HKG1ha2VTdHJpbmcoImF4SUQgIiwg YXhJRCkpOwogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKICAgICBMb2NrZXIgbG9ja2Vy IHsgbV9jaGFuZ2VMb2dMb2NrIH07CkBAIC00MDYsNyArNDA2LDcgQEAgdm9pZCBBWElzb2xhdGVk VHJlZTo6c2V0Rm9jdXNlZE5vZGVJRChBWElEIGF4SUQpCiB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpy ZW1vdmVOb2RlKEFYSUQgYXhJRCkKIHsKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6cmVt b3ZlTm9kZSIpOwotICAgIEFYTE9HKG1ha2VTdHJpbmcoIkFYSUQgIiwgYXhJRC5sb2dnaW5nU3Ry aW5nKCkpKTsKKyAgICBBWExPRyhtYWtlU3RyaW5nKCJBWElEICIsIGF4SUQpKTsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwogCiAgICAgbV9ub2RlTWFwLnJlbW92ZShheElEKTsKQEAgLTQx NywxMyArNDE3LDEzIEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnJlbW92ZU5vZGUoQVhJRCBheElE KQogdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlU3VidHJlZShBWElEIGF4SUQpCiB7CiAgICAg QVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnJlbW92ZVN1YnRyZWUiKTsKLSAgICBBWExPRyhtYWtl U3RyaW5nKCJSZW1vdmluZyBzdWJ0cmVlIGZvciBheElEICIsIGF4SUQubG9nZ2luZ1N0cmluZygp KSk7CisgICAgQVhMT0cobWFrZVN0cmluZygiUmVtb3Zpbmcgc3VidHJlZSBmb3IgYXhJRCAiLCBh eElEKSk7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIFZlY3RvcjxBWElEPiBy ZW1vdmFscyA9IHsgYXhJRCB9OwogICAgIHdoaWxlIChyZW1vdmFscy5zaXplKCkpIHsKICAgICAg ICAgQVhJRCBheElEID0gcmVtb3ZhbHMudGFrZUxhc3QoKTsKLSAgICAgICAgaWYgKCFheElELmlz VmFsaWQoKSkKKyAgICAgICAgaWYgKGF4SUQgPT0gSW52YWxpZEFYSUQpCiAgICAgICAgICAgICBj b250aW51ZTsKIAogICAgICAgICBhdXRvIGl0ID0gbV9ub2RlTWFwLmZpbmQoYXhJRCk7CkBAIC00 NDksOSArNDQ5LDkgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygp CiAgICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogCiAgICAgaWYgKG1fcGVu ZGluZ0ZvY3VzZWROb2RlSUQgIT0gbV9mb2N1c2VkTm9kZUlEKSB7Ci0gICAgICAgIEFYTE9HKG1h a2VTdHJpbmcoImZvY3VzZWROb2RlSUQgIiwgbV9mb2N1c2VkTm9kZUlELmxvZ2dpbmdTdHJpbmco KSwgIiBwZW5kaW5nRm9jdXNlZE5vZGVJRCAiLCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlELmxvZ2dp bmdTdHJpbmcoKSkpOworICAgICAgICBBWExPRyhtYWtlU3RyaW5nKCJmb2N1c2VkTm9kZUlEICIs IG1fZm9jdXNlZE5vZGVJRCwgIiBwZW5kaW5nRm9jdXNlZE5vZGVJRCAiLCBtX3BlbmRpbmdGb2N1 c2VkTm9kZUlEKSk7CiAKLSAgICAgICAgaWYgKG1fZm9jdXNlZE5vZGVJRC5pc1ZhbGlkKCkpIHsK KyAgICAgICAgaWYgKG1fZm9jdXNlZE5vZGVJRCAhPSBJbnZhbGlkQVhJRCkgewogICAgICAgICAg ICAgLy8gU2V0IHRoZSBvbGQgZm9jdXNlZCBvYmplY3QncyBJc0ZvY3VzZWQgcHJvcGVydHkgdG8g ZmFsc2UuCiAgICAgICAgICAgICBBWFByb3BlcnR5TWFwIHByb3BlcnR5TWFwOwogICAgICAgICAg ICAgcHJvcGVydHlNYXAuc2V0KEFYUHJvcGVydHlOYW1lOjpJc0ZvY3VzZWQsIGZhbHNlKTsKQEAg LTQ2Miw3ICs0NjIsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2Vz KCkKIAogICAgIHdoaWxlIChtX3BlbmRpbmdOb2RlUmVtb3ZhbHMuc2l6ZSgpKSB7CiAgICAgICAg IGF1dG8gYXhJRCA9IG1fcGVuZGluZ05vZGVSZW1vdmFscy50YWtlTGFzdCgpOwotICAgICAgICBB WExPRyhtYWtlU3RyaW5nKCJyZW1vdmluZyBheElEICIsIGF4SUQubG9nZ2luZ1N0cmluZygpKSk7 CisgICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoInJlbW92aW5nIGF4SUQgIiwgYXhJRCkpOwogICAg ICAgICBpZiAoYXV0byBvYmplY3QgPSBub2RlRm9ySUQoYXhJRCkpIHsKICAgICAgICAgICAgIG9i amVjdC0+ZGV0YWNoKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZTo6RWxlbWVudERlc3Ryb3ll ZCk7CiAgICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAucmVtb3ZlKGF4SUQpOwpAQCAt NDcxLDcgKzQ3MSw3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMo KQogCiAgICAgd2hpbGUgKG1fcGVuZGluZ1N1YnRyZWVSZW1vdmFscy5zaXplKCkpIHsKICAgICAg ICAgYXV0byBheElEID0gbV9wZW5kaW5nU3VidHJlZVJlbW92YWxzLnRha2VMYXN0KCk7Ci0gICAg ICAgIEFYTE9HKG1ha2VTdHJpbmcoInJlbW92aW5nIHN1YnRyZWUgYXhJRCAiLCBheElELmxvZ2dp bmdTdHJpbmcoKSkpOworICAgICAgICBBWExPRyhtYWtlU3RyaW5nKCJyZW1vdmluZyBzdWJ0cmVl IGF4SUQgIiwgYXhJRCkpOwogICAgICAgICBpZiAoYXV0byBvYmplY3QgPSBub2RlRm9ySUQoYXhJ RCkpIHsKICAgICAgICAgICAgIG9iamVjdC0+ZGV0YWNoKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50 VHlwZTo6RWxlbWVudERlc3Ryb3llZCk7CiAgICAgICAgICAgICBtX3BlbmRpbmdTdWJ0cmVlUmVt b3ZhbHMuYXBwZW5kVmVjdG9yKG9iamVjdC0+bV9jaGlsZHJlbklEcyk7CkBAIC00ODEsOCArNDgx LDggQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygpCiAKICAgICBm b3IgKGNvbnN0IGF1dG8mIGl0ZW0gOiBtX3BlbmRpbmdBcHBlbmRzKSB7CiAgICAgICAgIEFYSUQg YXhJRCA9IGl0ZW0uaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCk7Ci0gICAgICAgIEFYTE9HKG1h a2VTdHJpbmcoImFwcGVuZGluZyBheElEICIsIGF4SUQubG9nZ2luZ1N0cmluZygpKSk7Ci0gICAg ICAgIGlmICghYXhJRC5pc1ZhbGlkKCkpCisgICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoImFwcGVu ZGluZyBheElEICIsIGF4SUQpKTsKKyAgICAgICAgaWYgKGF4SUQgPT0gSW52YWxpZEFYSUQpCiAg ICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvJiB3cmFwcGVyID0gaXRlbS53cmFw cGVyID8gaXRlbS53cmFwcGVyIDogaXRlbS5pc29sYXRlZE9iamVjdC0+d3JhcHBlcigpOwpAQCAt NTE4LDcgKzUxOCw3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMo KQogICAgIG1fcGVuZGluZ0FwcGVuZHMuY2xlYXIoKTsKIAogICAgIGZvciAoYXV0byYgdXBkYXRl IDogbV9wZW5kaW5nQ2hpbGRyZW5VcGRhdGVzKSB7Ci0gICAgICAgIEFYTE9HKG1ha2VTdHJpbmco InVwZGF0aW5nIGNoaWxkcmVuIGZvciBheElEICIsIHVwZGF0ZS5maXJzdC5sb2dnaW5nU3RyaW5n KCkpKTsKKyAgICAgICAgQVhMT0cobWFrZVN0cmluZygidXBkYXRpbmcgY2hpbGRyZW4gZm9yIGF4 SUQgIiwgdXBkYXRlLmZpcnN0KSk7CiAgICAgICAgIGlmIChhdXRvIG9iamVjdCA9IG5vZGVGb3JJ RCh1cGRhdGUuZmlyc3QpKQogICAgICAgICAgICAgb2JqZWN0LT5tX2NoaWxkcmVuSURzID0gV1RG TW92ZSh1cGRhdGUuc2Vjb25kKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCAyNWNk Y2M4OWVmZmFiNDMxZDg5NTUxMjljZGRkMjNkZmFkNzEwZGFiLi4xNmJkNDZmNDk5NjFlNDRmYTRm ZDc1N2NiMWIzMTBjYWM3MTlmOGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTMyMyw3ICsz MjMsNyBAQCB1c2luZyBBWFByb3BlcnR5VmFsdWVWYXJpYW50ID0gc3RkOjp2YXJpYW50PHN0ZDo6 bnVsbHB0cl90LCBBWElELCBTdHJpbmcsIGJvb2wsCiB1c2luZyBBWFByb3BlcnR5TWFwID0gSGFz aE1hcDxBWFByb3BlcnR5TmFtZSwgQVhQcm9wZXJ0eVZhbHVlVmFyaWFudCwgSW50SGFzaDxBWFBy b3BlcnR5TmFtZT4sIFdURjo6U3Ryb25nRW51bUhhc2hUcmFpdHM8QVhQcm9wZXJ0eU5hbWU+PjsK IAogc3RydWN0IEFYUHJvcGVydHlDaGFuZ2UgewotICAgIEFYSUQgYXhJRDsgLy8gSUQgb2YgdGhl IG9iamVjdCB3aG9zZSBwcm9wZXJ0aWVzIGNoYW5nZWQuCisgICAgQVhJRCBheElEIHsgSW52YWxp ZEFYSUQgfTsgLy8gSUQgb2YgdGhlIG9iamVjdCB3aG9zZSBwcm9wZXJ0aWVzIGNoYW5nZWQuCiAg ICAgQVhQcm9wZXJ0eU1hcCBwcm9wZXJ0aWVzOyAvLyBDaGFuZ2VkIHByb3BlcnRpZXMuCiB9Owog CkBAIC00MDcsOCArNDA3LDggQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8QVhJRD4gbV9wZW5kaW5n Tm9kZVJlbW92YWxzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2NrKTsgLy8gTm9k ZXMgdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgogICAgIFZlY3RvcjxBWElEPiBtX3BlbmRp bmdTdWJ0cmVlUmVtb3ZhbHMgV1RGX0dVQVJERURfQllfTE9DSyhtX2NoYW5nZUxvZ0xvY2spOyAv LyBOb2RlcyB3aG9zZSBzdWJ0cmVlcyBhcmUgdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgog ICAgIFZlY3RvcjxzdGQ6OnBhaXI8QVhJRCwgVmVjdG9yPEFYSUQ+Pj4gbV9wZW5kaW5nQ2hpbGRy ZW5VcGRhdGVzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2NrKTsKLSAgICBBWElE IG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgV1RGX0dVQVJERURfQllfTE9DSyhtX2NoYW5nZUxvZ0xv Y2spOwotICAgIEFYSUQgbV9mb2N1c2VkTm9kZUlEOworICAgIEFYSUQgbV9wZW5kaW5nRm9jdXNl ZE5vZGVJRCBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fY2hhbmdlTG9nTG9jaykgeyBJbnZhbGlkQVhJ RCB9OworICAgIEFYSUQgbV9mb2N1c2VkTm9kZUlEIHsgSW52YWxpZEFYSUQgfTsKICAgICBMb2Nr IG1fY2hhbmdlTG9nTG9jazsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbSBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy QmFzZS5tbQppbmRleCAxZTU2OTFkMTlmOTI0MmZlMjc0YzIyNzBmZjZlZTM2YThmMmY2YzVjLi4z N2Q2Y2M2MmE5NTYxODQ4MTVkNGJhNmE0OWM5ZTcxNWRiMjlmY2Y4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCkBAIC0yOTAsMTggKzI5MCwxOCBAQCAtIChpZClp bml0V2l0aEFjY2Vzc2liaWxpdHlPYmplY3Q6KEFYQ29yZU9iamVjdCopYXhPYmplY3QKIAogLSAo dm9pZClhdHRhY2hBWE9iamVjdDooQVhDb3JlT2JqZWN0KilheE9iamVjdAogewotICAgIEFTU0VS VChheE9iamVjdCAmJiAoIV9pZGVudGlmaWVyLmlzVmFsaWQoKSB8fCBfaWRlbnRpZmllciA9PSBh eE9iamVjdC0+b2JqZWN0SUQoKSkpOworICAgIEFTU0VSVChheE9iamVjdCAmJiAoX2lkZW50aWZp ZXIgPT0gSW52YWxpZEFYSUQgfHwgX2lkZW50aWZpZXIgPT0gYXhPYmplY3QtPm9iamVjdElEKCkp KTsKICAgICBtX2F4T2JqZWN0ID0gYXhPYmplY3Q7Ci0gICAgaWYgKCFfaWRlbnRpZmllci5pc1Zh bGlkKCkpCisgICAgaWYgKF9pZGVudGlmaWVyID09IEludmFsaWRBWElEKQogICAgICAgICBfaWRl bnRpZmllciA9IG1fYXhPYmplY3QtPm9iamVjdElEKCk7CiB9CiAKICNpZiBFTkFCTEUoQUNDRVNT SUJJTElUWV9JU09MQVRFRF9UUkVFKQogLSAodm9pZClhdHRhY2hJc29sYXRlZE9iamVjdDooQVhD b3JlT2JqZWN0Kilpc29sYXRlZE9iamVjdAogewotICAgIEFTU0VSVChpc29sYXRlZE9iamVjdCAm JiAoIV9pZGVudGlmaWVyLmlzVmFsaWQoKSB8fCBfaWRlbnRpZmllciA9PSBpc29sYXRlZE9iamVj dC0+b2JqZWN0SUQoKSkpOworICAgIEFTU0VSVChpc29sYXRlZE9iamVjdCAmJiAoX2lkZW50aWZp ZXIgPT0gSW52YWxpZEFYSUQgfHwgX2lkZW50aWZpZXIgPT0gaXNvbGF0ZWRPYmplY3QtPm9iamVj dElEKCkpKTsKICAgICBtX2lzb2xhdGVkT2JqZWN0ID0gaXNvbGF0ZWRPYmplY3Q7Ci0gICAgaWYg KCFfaWRlbnRpZmllci5pc1ZhbGlkKCkpCisgICAgaWYgKF9pZGVudGlmaWVyID09IEludmFsaWRB WElEKQogICAgICAgICBfaWRlbnRpZmllciA9IG1faXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCk7 CiB9CiAjZW5kaWYKQEAgLTMwOSwxNCArMzA5LDE0IEBAIC0gKHZvaWQpYXR0YWNoSXNvbGF0ZWRP YmplY3Q6KEFYQ29yZU9iamVjdCopaXNvbGF0ZWRPYmplY3QKIC0gKHZvaWQpZGV0YWNoCiB7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBfaWRlbnRpZmllciA9IHsgfTsKKyAgICBf aWRlbnRpZmllciA9IEludmFsaWRBWElEOwogICAgIG1fYXhPYmplY3QgPSBudWxscHRyOwogfQog CiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKIC0gKHZvaWQpZGV0YWNo SXNvbGF0ZWRPYmplY3Q6KEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSlkZXRhY2htZW50VHlw ZQogewotICAgIEFTU0VSVF9VTlVTRUQoZGV0YWNobWVudFR5cGUsIGRldGFjaG1lbnRUeXBlID09 IEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZTo6RWxlbWVudENoYW5nZWQgPyBfaWRlbnRpZmll ci5pc1ZhbGlkKCkgJiYgbV9heE9iamVjdCA6IHRydWUpOworICAgIEFTU0VSVF9VTlVTRUQoZGV0 YWNobWVudFR5cGUsIGRldGFjaG1lbnRUeXBlID09IEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlw ZTo6RWxlbWVudENoYW5nZWQgPyBfaWRlbnRpZmllciAhPSBJbnZhbGlkQVhJRCAmJiBtX2F4T2Jq ZWN0IDogdHJ1ZSk7CiAgICAgbV9pc29sYXRlZE9iamVjdCA9IG51bGxwdHI7CiB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FYT2JqZWN0Q2Fj aGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQVhPYmplY3RDYWNo ZVdpbi5jcHAKaW5kZXggNzljYjc5MTg5OTdhMTllNGRjNGZkZDI0NTM0MzY3ZmQyOGFmZjdkYS4u YjA4ZTNjZTFmNWY4MGRiMDA5NDJlMzQ3NGJiMGUwYWZjNWE2N2YyMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQVhPYmplY3RDYWNoZVdpbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQVhPYmplY3RDYWNoZVdpbi5jcHAKQEAg LTEyMCw3ICsxMjAsNyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNh dGlvbihBWENvcmVPYmplY3QqIG9iaiwgQVhOb3RpZmljYXRpb24gbgogICAgIEFTU0VSVChvYmot Pm9iamVjdElEKCkgPj0gMSk7CiAgICAgQVNTRVJUKG9iai0+b2JqZWN0SUQoKSA8PSBzdGQ6Om51 bWVyaWNfbGltaXRzPExPTkc+OjptYXgoKSk7CiAKLSAgICBOb3RpZnlXaW5FdmVudChtc2FhRXZl bnQsIHBhZ2UtPmNocm9tZSgpLnBsYXRmb3JtUGFnZUNsaWVudCgpLCBPQkpJRF9DTElFTlQsIC1z dGF0aWNfY2FzdDxMT05HPihvYmotPm9iamVjdElEKCkudG9VSW50NjQoKSkpOworICAgIE5vdGlm eVdpbkV2ZW50KG1zYWFFdmVudCwgcGFnZS0+Y2hyb21lKCkucGxhdGZvcm1QYWdlQ2xpZW50KCks IE9CSklEX0NMSUVOVCwgLXN0YXRpY19jYXN0PExPTkc+KG9iai0+b2JqZWN0SUQoKSkpOwogfQog CiB2b2lkIEFYT2JqZWN0Q2FjaGU6Om5vZGVUZXh0Q2hhbmdlUGxhdGZvcm1Ob3RpZmljYXRpb24o QWNjZXNzaWJpbGl0eU9iamVjdCosIEFYVGV4dENoYW5nZSwgdW5zaWduZWQsIGNvbnN0IFN0cmlu ZyYpCkBAIC0xNDgsMTkgKzE0OCwxOSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGlu Z0V2ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCogbwogCiBBWElE IEFYT2JqZWN0Q2FjaGU6OnBsYXRmb3JtR2VuZXJhdGVBWElEKCkgY29uc3QKIHsKLSAgICBzdGF0 aWMgTE9ORyBsYXN0VXNlZElEID0gMDsKKyAgICBzdGF0aWMgQVhJRCBsYXN0VXNlZElEID0gMDsK IAogICAgIC8vIEdlbmVyYXRlIGEgbmV3IElELiBXaW5kb3dzIGFjY2Vzc2liaWxpdHkgcmVsaWVz IG9uIGEgcG9zaXRpdmUgQVhJRCwKICAgICAvLyByYW5naW5nIGZyb20gMSB0byBMT05HX01BWC4K LSAgICBMT05HIGN1cnJlbnRJRCA9IGxhc3RVc2VkSUQ7Ci0gICAgQVhJRCBvYmpJRDsKKyAgICBB WElEIG9iaklEID0gbGFzdFVzZWRJRDsKICAgICBkbyB7Ci0gICAgICAgIG9iaklEID0gbWFrZU9i amVjdElkZW50aWZpZXI8QVhJRD4oKytjdXJyZW50SUQpOwotICAgIH0gd2hpbGUgKCFvYmpJRC5p c1ZhbGlkKCkgfHwgbV9pZHNJblVzZS5jb250YWlucyhvYmpJRCkpOworICAgICAgICArK29iaklE OworICAgICAgICBvYmpJRCAlPSBzdGQ6Om51bWVyaWNfbGltaXRzPExPTkc+OjptYXgoKTsKKyAg ICB9IHdoaWxlIChvYmpJRCA9PSAwIHx8IEhhc2hUcmFpdHM8QVhJRD46OmlzRGVsZXRlZFZhbHVl KG9iaklEKSB8fCBtX2lkc0luVXNlLmNvbnRhaW5zKG9iaklEKSk7CiAKLSAgICBBU1NFUlQob2Jq SUQuaXNWYWxpZCgpICYmIG9iaklELnRvVUludDY0KCkgPD0gc3RkOjpudW1lcmljX2xpbWl0czxM T05HPjo6bWF4KCkpOworICAgIEFTU0VSVChvYmpJRCA+PSAxICYmIG9iaklEIDw9IHN0ZDo6bnVt ZXJpY19saW1pdHM8TE9ORz46Om1heCgpKTsKIAotICAgIGxhc3RVc2VkSUQgPSBjdXJyZW50SUQ7 CisgICAgbGFzdFVzZWRJRCA9IG9iaklEOwogCiAgICAgcmV0dXJuIG9iaklEOwogfQo=