221643 2021-02-09 17:16:44 -0800 Use CompletionHandler instead of PrintFinishedCallback 2021-02-09 20:37:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen berto cdumez cgarcia ews-watchlist gustavo webkit-bug-importer oldest_to_newest 1727349 0 achristensen 2021-02-09 17:16:44 -0800 Use CompletionHandler instead of PrintFinishedCallback 1727350 1 419788 achristensen 2021-02-09 17:17:10 -0800 Created attachment 419788 Patch 1727352 2 ews-watchlist 2021-02-09 17:18:15 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1727377 3 419801 achristensen 2021-02-09 18:09:17 -0800 Created attachment 419801 Patch 1727383 4 419804 achristensen 2021-02-09 18:59:15 -0800 Created attachment 419804 Patch 1727405 5 achristensen 2021-02-09 20:36:11 -0800 http://trac.webkit.org/r272635 1727406 6 webkit-bug-importer 2021-02-09 20:37:15 -0800 <rdar://problem/74173400> 419788 2021-02-09 17:17:10 -0800 2021-02-09 18:16:37 -0800 Patch bug-221643-20210209171710.patch text/plain 13381 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcyYmIxZTE1ZmZlMzkzNmMw MjAxNTJmMjIyZDAxMDQzYzVlYzNiMWUuLjZkZmY3MTlkOGE1MTU1NmU0MzBjNmQ1YjdlNzBhMGYy MWRjMDhkODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDItMDkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgQ29tcGxl dGlvbkhhbmRsZXIgaW5zdGVhZCBvZiBQcmludEZpbmlzaGVkQ2FsbGJhY2sKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY0MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwOgorICAgICAgICAod2Via2l0UHJpbnRPcGVyYXRpb25Q cmludFBhZ2VzRm9yRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRyYXdQYWdlc0ZvclByaW50aW5nKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwcmludEZpbmlzaGVkQ2FsbGJhY2spOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZHJhd1BhZ2Vz Rm9yUHJpbnRpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRGaW5pc2hQcmludE9w ZXJhdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50RG9uZSk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oOgorCiAy MDIxLTAyLTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVXNlIENvbXBsZXRpb25IYW5kbGVyIGluc3RlYWQgb2YgQ29tcHV0ZWRQYWdlc0Nh bGxiYWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFByaW50T3BlcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0UHJpbnRPcGVyYXRpb24uY3BwCmluZGV4IDY3ZWNjYWRjNTYwZTk0ODBmMGNkZmQ3ZmFjMTEw NjJiZTBlODIxZjAuLmM5NjdhNDY3ZjczNmY5MzQ4ZjI4MDcyNjBmNGY3MjhiMjEwMjFhMmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpbnRPcGVy YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJp bnRPcGVyYXRpb24uY3BwCkBAIC0zMjYsNyArMzI2LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0UHJp bnRPcGVyYXRpb25QcmludFBhZ2VzRm9yRnJhbWUoV2ViS2l0UHJpbnRPcGVyYXRpb24qIHByaW50 T3AKICAgICBQcmludEluZm8gcHJpbnRJbmZvKHByaW50U2V0dGluZ3MsIHBhZ2VTZXR1cCwgcHJp bnRPcGVyYXRpb24tPnByaXYtPnByaW50TW9kZSk7CiAgICAgYXV0byYgcGFnZSA9IHdlYmtpdFdl YlZpZXdHZXRQYWdlKHByaW50T3BlcmF0aW9uLT5wcml2LT53ZWJWaWV3KTsKICAgICBnX29iamVj dF9yZWYocHJpbnRPcGVyYXRpb24pOwotICAgIHBhZ2UuZHJhd1BhZ2VzRm9yUHJpbnRpbmcod2Vi RnJhbWUsIHByaW50SW5mbywgUHJpbnRGaW5pc2hlZENhbGxiYWNrOjpjcmVhdGUoW3ByaW50T3Bl cmF0aW9uXShBUEk6OkVycm9yKiBwcmludEVycm9yLCBDYWxsYmFja0Jhc2U6OkVycm9yKSB7Cisg ICAgcGFnZS5kcmF3UGFnZXNGb3JQcmludGluZyh3ZWJGcmFtZSwgcHJpbnRJbmZvLCBQcmludEZp bmlzaGVkQ2FsbGJhY2s6OmNyZWF0ZShbcHJpbnRPcGVyYXRpb25dKEFQSTo6RXJyb3IqIHByaW50 RXJyb3IpIHsKICAgICAgICAgZHJhd1BhZ2VzRm9yUHJpbnRpbmdDb21wbGV0ZWQocHJpbnRFcnJv ciwgYWRvcHRHUmVmKHByaW50T3BlcmF0aW9uKS5nZXQoKSk7CiAgICAgfSkpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggOGNiNWQyM2JlOGNkNGUyMDU5 ZGU0NWNlYjViYzQ4YmUwMTc4MDdmNS4uZWE1ZDA0MmJiMWMyNTg3ZDgwMWM4YTEzZjI1ZmEyNmRi Y2ZlZmExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03 Mjg3LDE5ICs3Mjg3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvZ1Njcm9sbGluZ0V2ZW50KHVp bnQzMl90IGV2ZW50VHlwZSwgTW9ub3RvbmljVGltZSB0aW1lc3RhbXAKICAgICB9CiB9CiAKLSNp ZiBQTEFURk9STShHVEspCi12b2lkIFdlYlBhZ2VQcm94eTo6cHJpbnRGaW5pc2hlZENhbGxiYWNr KGNvbnN0IFJlc291cmNlRXJyb3ImIHByaW50RXJyb3IsIENhbGxiYWNrSUQgY2FsbGJhY2tJRCkK LXsKLSAgICBhdXRvIGNhbGxiYWNrID0gbV9jYWxsYmFja3MudGFrZTxQcmludEZpbmlzaGVkQ2Fs bGJhY2s+KGNhbGxiYWNrSUQpOwotICAgIGlmICghY2FsbGJhY2spIHsKLSAgICAgICAgLy8gRklY TUU6IExvZyBlcnJvciBvciBhc3NlcnQuCi0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBj YWxsYmFjay0+cGVyZm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKEFQSTo6RXJyb3I6OmNyZWF0 ZShwcmludEVycm9yKS5wdHIoKSk7Ci19Ci0jZW5kaWYKLQogdm9pZCBXZWJQYWdlUHJveHk6OmZv Y3VzZWRGcmFtZUNoYW5nZWQoY29uc3QgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiYgZnJhbWVJ RCkKIHsKICAgICBpZiAoIWZyYW1lSUQpIHsKQEAgLTg1NjUsMTcgKzg1NTIsMTUgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRyYXdQYWdlc1RvUERGKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBQ cmludEluZm8mIHByaW50SW4KICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEcmF3UGFnZXNU b1BERihmcmFtZS0+ZnJhbWVJRCgpLCBwcmludEluZm8sIGZpcnN0LCBjb3VudCwgY2FsbGJhY2tJ RCksIHByaW50aW5nU2VuZE9wdGlvbnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbikp OwogfQogI2VsaWYgUExBVEZPUk0oR1RLKQotdm9pZCBXZWJQYWdlUHJveHk6OmRyYXdQYWdlc0Zv clByaW50aW5nKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBQcmludEluZm8mIHByaW50SW5m bywgUmVmPFByaW50RmluaXNoZWRDYWxsYmFjaz4mJiBjYWxsYmFjaykKK3ZvaWQgV2ViUGFnZVBy b3h5OjpkcmF3UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgUHJp bnRJbmZvJiBwcmludEluZm8sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoQVBJOjpFcnJvciopPiYm IGNhbGxiYWNrKQogewotICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewotICAgICAgICBj YWxsYmFjay0+aW52YWxpZGF0ZSgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgYXV0 byBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKLSAgICBtX2NhbGxiYWNrcy5w dXQoV1RGTW92ZShjYWxsYmFjaykpOworICAgIGF1dG8gY2FsbGJhY2tXcmFwcGVyID0gW2NhbGxi YWNrID0gV1RGTW92ZShjYWxsYmFjayldIChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBl cnJvcikgbXV0YWJsZSB7CisgICAgICAgIGlmIChlcnJvci5pc051bGwoKSkKKyAgICAgICAgICAg IHJldHVybiBjYWxsYmFjayhudWxscHRyKTsKKyAgICAgICAgY2FsbGJhY2soQVBJOjpFcnJvcjo6 Y3JlYXRlKGVycm9yKS5wdHIoKSk7CisgICAgfTsKICAgICBtX2lzSW5QcmludGluZ01vZGUgPSB0 cnVlOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRyYXdQYWdlc0ZvclByaW50aW5nKGZy YW1lLT5mcmFtZUlEKCksIHByaW50SW5mbywgY2FsbGJhY2tJRCksIHByaW50aW5nU2VuZE9wdGlv bnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbikpOworICAgIHNlbmRXaXRoQXN5bmNS ZXBseShNZXNzYWdlczo6V2ViUGFnZTo6RHJhd1BhZ2VzRm9yUHJpbnRpbmcoZnJhbWUtPmZyYW1l SUQoKSwgcHJpbnRJbmZvKSwgV1RGTW92ZShjYWxsYmFja1dyYXBwZXIpLCBwcmludGluZ1NlbmRP cHRpb25zKG1faXNQZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24pKTsKIH0KICNlbmRpZgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDZjZTgzM2IxYjZmZmIzZDdh MjAxZTM5YzUyZDdhYWQ5NjBiZTUzZTcuLjQyZjA2MTM2YTM5YmRiMWJjYTkyM2E3YTBlM2YzNTYw ZjYyMjZjYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xODcs NiArMTg3LDcgQEAgbmFtZXNwYWNlIEFQSSB7CiBjbGFzcyBBdHRhY2htZW50OwogY2xhc3MgQ29u dGVudFdvcmxkOwogY2xhc3MgQ29udGV4dE1lbnVDbGllbnQ7CitjbGFzcyBFcnJvcjsKIGNsYXNz IEZpbmRDbGllbnQ7CiBjbGFzcyBGaW5kTWF0Y2hlc0NsaWVudDsKIGNsYXNzIEZvcm1DbGllbnQ7 CkBAIC0zODYsMTAgKzM4Nyw2IEBAIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFN0cmlu ZyY+IFN0cmluZ0NhbGxiYWNrOwogdXNpbmcgTGF5ZXJIb3N0aW5nQ29udGV4dElEID0gdWludDMy X3Q7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdUSykKLXR5cGVkZWYgR2VuZXJpY0NhbGxiYWNr PEFQSTo6RXJyb3IqPiBQcmludEZpbmlzaGVkQ2FsbGJhY2s7Ci0jZW5kaWYKLQogI2lmIEVOQUJM RShUT1VDSF9FVkVOVFMpCiBzdHJ1Y3QgUXVldWVkVG91Y2hFdmVudHMgewogICAgIFF1ZXVlZFRv dWNoRXZlbnRzKGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50KQpAQCAtMTMwMSw3ICsx Mjk4LDcgQEAgcHVibGljOgogICAgIHN0ZDo6cGFpcjxzaXplX3QsIHVpbnQ2NF90PiBjb21wdXRl UGFnZXNGb3JQcmludGluZ0FuZERyYXdUb1BERihXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIsIGNv bnN0IFByaW50SW5mbyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgSVBDOjpEYXRhUmVm ZXJlbmNlJik+JiYpOwogI2VuZGlmCiAjZWxpZiBQTEFURk9STShHVEspCi0gICAgdm9pZCBkcmF3 UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgUmVmPFBy aW50RmluaXNoZWRDYWxsYmFjaz4mJik7CisgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmludGluZyhX ZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChB UEk6OkVycm9yKik+JiYpOwogI2VuZGlmCiAKICAgICBQYWdlTG9hZFN0YXRlJiBwYWdlTG9hZFN0 YXRlKCkgeyByZXR1cm4gbV9wYWdlTG9hZFN0YXRlOyB9CkBAIC0yMTcxLDkgKzIxNjgsNiBAQCBw cml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVTdHJpbmdGb3JGaW5kKGNvbnN0IFN0cmluZyYpOwog I2VuZGlmCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIHZvaWQgcHJpbnRGaW5pc2hlZENhbGxiYWNr KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBDYWxsYmFja0lEKTsKLSNlbmRpZgogCiAg ICAgdm9pZCBmb2N1c2VkRnJhbWVDaGFuZ2VkKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1l SWRlbnRpZmllcj4mKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluCmluZGV4IGI0OWM3OTVjZjg0OGVjNjNiZTNkYmI4ZjQ0Zjc1YzhhZjNi Y2RmZmEuLjAxZDhmY2IyMzEwYzcwNTJlMGI0NzEyYmUyOWYyYjRmOWJlMDllNjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTE4 Niw5ICsxODYsNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogI2lmIEVOQUJMRShEQVRB X0RFVEVDVElPTikKICAgICBTZXREYXRhRGV0ZWN0aW9uUmVzdWx0KHN0cnVjdCBXZWJLaXQ6OkRh dGFEZXRlY3Rpb25SZXN1bHQgZGF0YURldGVjdGlvblJlc3VsdCkKICNlbmRpZgotI2lmIFBMQVRG T1JNKEdUSykKLSAgICBQcmludEZpbmlzaGVkQ2FsbGJhY2soV2ViQ29yZTo6UmVzb3VyY2VFcnJv ciBlcnJvciwgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCi0jZW5kaWYKIAogICAgIFBh Z2VTY2FsZUZhY3RvckRpZENoYW5nZShkb3VibGUgc2NhbGVGYWN0b3IpCiAgICAgUGx1Z2luU2Nh bGVGYWN0b3JEaWRDaGFuZ2UoZG91YmxlIHpvb21GYWN0b3IpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDI3MzUwYWFiYzk5ZjY3Y2JlMzg1MzQ4 ODkxN2U4Mjc2NGRlYmRmZTQuLjkwZTY4MjI3NGNmNjg1OTFjNGQxMmQ2ZjVlNTNhNDliZGM4NTky NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBA IC01MjM2LDIxICs1MjM2LDE3IEBAIHZvaWQgV2ViUGFnZTo6ZHJhd1BhZ2VzVG9QREZJbXBsKEZy YW1lSWRlbnRpZmllciBmcmFtZUlELCBjb25zdCBQcmludEluZm8mIHByaW50CiB9CiAKICNlbGlm IFBMQVRGT1JNKEdUSykKLXZvaWQgV2ViUGFnZTo6ZHJhd1BhZ2VzRm9yUHJpbnRpbmcoRnJhbWVJ ZGVudGlmaWVyIGZyYW1lSUQsIGNvbnN0IFByaW50SW5mbyYgcHJpbnRJbmZvLCBDYWxsYmFja0lE IGNhbGxiYWNrSUQpCit2b2lkIFdlYlBhZ2U6OmRyYXdQYWdlc0ZvclByaW50aW5nKEZyYW1lSWRl bnRpZmllciBmcmFtZUlELCBjb25zdCBQcmludEluZm8mIHByaW50SW5mbywgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhh bmRsZXIpCiB7CiAgICAgYmVnaW5QcmludGluZyhmcmFtZUlELCBwcmludEluZm8pOwogICAgIGlm IChtX3ByaW50Q29udGV4dCAmJiBtX3ByaW50T3BlcmF0aW9uKSB7Ci0gICAgICAgIG1fcHJpbnRP cGVyYXRpb24tPnN0YXJ0UHJpbnQobV9wcmludENvbnRleHQuZ2V0KCksIGNhbGxiYWNrSUQpOwor ICAgICAgICBtX3ByaW50T3BlcmF0aW9uLT5zdGFydFByaW50KG1fcHJpbnRDb250ZXh0LmdldCgp LCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYgZXJyb3IpIG11dGFibGUgeworICAgICAgICAgICAgbV9wcmludE9wZXJhdGlvbiA9IG51 bGxwdHI7CisgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihlcnJvcik7CisgICAgICAgIH0p OwogICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpWb2lkQ2FsbGJhY2soY2FsbGJhY2tJRCkpOwotfQotCi12b2lkIFdlYlBhZ2U6OmRpZEZp bmlzaFByaW50T3BlcmF0aW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBD YWxsYmFja0lEIGNhbGxiYWNrSUQpCi17Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpQcmludEZpbmlzaGVkQ2FsbGJhY2soZXJyb3IsIGNhbGxiYWNrSUQpKTsKLSAgICBtX3ByaW50 T3BlcmF0aW9uID0gbnVsbHB0cjsKKyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogfQogI2Vu ZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA2 Y2FmMWQ1NGU3N2FjMWYyNjczYTFhOWM3YmJjNzM0ZGFkNGRjYzMyLi4xMzJkYmU5NzMyNjcxNjZj MGEwOTdmMmE1YmEwNjFmYmVkMjUyOWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCkBAIC05NzgsOCArOTc4LDcgQEAgcHVibGljOgogICAgIHZvaWQgZHJh d1RvUERGKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciwgY29uc3QgT3B0aW9uYWw8V2ViQ29yZTo6 RmxvYXRSZWN0PiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgSVBDOjpEYXRhUmVmZXJl bmNlJik+JiYpOwogCiAjaWYgUExBVEZPUk0oR1RLKQotICAgIHZvaWQgZHJhd1BhZ2VzRm9yUHJp bnRpbmcoV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyLCBjb25zdCBQcmludEluZm8mLCBDYWxsYmFj a0lEKTsKLSAgICB2b2lkIGRpZEZpbmlzaFByaW50T3BlcmF0aW9uKGNvbnN0IFdlYkNvcmU6OlJl c291cmNlRXJyb3ImLCBDYWxsYmFja0lEKTsKKyAgICB2b2lkIGRyYXdQYWdlc0ZvclByaW50aW5n KFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciwgY29uc3QgUHJpbnRJbmZvJiwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+JiYpOwogI2VuZGlmCiAK ICAgICB2b2lkIGFkZFJlc291cmNlUmVxdWVzdCh1bnNpZ25lZCBsb25nLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDg1YTNkYWQ5NzVlOWEwZjIzN2NmMTg3 NGE5ZDZkMWQ4NGVhYjlkNGQuLjg4ZmM4ZDA5MzNlNDZlMzZkYjVhZTcwZjc2MzRjYjZmNDU5ZjIx ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgpAQCAtNDA4LDcgKzQwOCw3IEBAIEdlbmVyYXRlU3ludGhldGljRWRpdGlu Z0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBl CiAgICAgRHJhd1RvUERGKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBPcHRpb25h bDxXZWJDb3JlOjpGbG9hdFJlY3Q+IHJlY3QpIC0+IChJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkg QXN5bmMKICNlbmRpZgogI2lmIFBMQVRGT1JNKEdUSykKLSAgICBEcmF3UGFnZXNGb3JQcmludGlu ZyhXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgc3RydWN0IFdlYktpdDo6UHJpbnRJ bmZvIHByaW50SW5mbywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCisgICAgRHJhd1Bh Z2VzRm9yUHJpbnRpbmcoV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHN0cnVjdCBX ZWJLaXQ6OlByaW50SW5mbyBwcmludEluZm8pIC0+IChXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVy cm9yKSBBc3luYwogI2VuZGlmCiAKICAgICAjIE1lZGlhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmNw cAppbmRleCBmMTMzN2EwZTVlNzBiNmY2YWI3Mjk2MTNmNzhiYTFmZmRjYTg0MTA2Li5mNTgyMjlk NTk2NThiMDJmYTFjOWQ3ZDRhYzFhMjJiNjMyZTVlMWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0 ay5jcHAKQEAgLTY0LDEwICs2NCwxMCBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIHZv aWQgc3RhcnRQcmludChXZWJDb3JlOjpQcmludENvbnRleHQqIHByaW50Q29udGV4dCwgQ2FsbGJh Y2tJRCBjYWxsYmFja0lEKSBvdmVycmlkZQorICAgIHZvaWQgc3RhcnRQcmludChXZWJDb3JlOjpQ cmludENvbnRleHQqIHByaW50Q29udGV4dCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhhbmRsZXIpIG92ZXJyaWRlCiAg ICAgewogICAgICAgICBtX3ByaW50Q29udGV4dCA9IHByaW50Q29udGV4dDsKLSAgICAgICAgbV9j YWxsYmFja0lEID0gY2FsbGJhY2tJRDsKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOwogCiAgICAgICAgIFJlZlB0cjxQcmludGVyTGlzdEd0 az4gcHJpbnRlckxpc3QgPSBQcmludGVyTGlzdEd0azo6Z2V0T3JDcmVhdGUoKTsKICAgICAgICAg QVNTRVJUKHByaW50ZXJMaXN0KTsKQEAgLTE3Niw2ICsxNzYsNyBAQCBwdWJsaWM6CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5Pihwcmlu dEpvYkZpbmlzaGVkKSk7CiAgICAgfQogCisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25z dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+IG1fY29tcGxldGlvbkhhbmRsZXI7CiAgICAgR1Jl ZlB0cjxHdGtQcmludEpvYj4gbV9wcmludEpvYjsKIH07CiAjZW5kaWYKQEAgLTE4OCwxMSArMTg5 LDExIEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgdm9pZCBzdGFydFByaW50KFdlYkNv cmU6OlByaW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpIG92 ZXJyaWRlCisgICAgdm9pZCBzdGFydFByaW50KFdlYkNvcmU6OlByaW50Q29udGV4dCogcHJpbnRD b250ZXh0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIG1fcHJp bnRDb250ZXh0ID0gcHJpbnRDb250ZXh0OwotICAgICAgICBtX2NhbGxiYWNrSUQgPSBjYWxsYmFj a0lEOwogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxl cih7IH0pOwogICAgIH0KIAogICAgIHZvaWQgc3RhcnRQYWdlKGNhaXJvX3QqIGNyKSBvdmVycmlk ZQpAQCAtNzE5LDggKzcyMCw4IEBAIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50RG9u ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICBtX3ByaW50UGFnZXNJ ZGxlSWQgPSAwOwogCiAgICAgLy8gUHJpbnQgZmluaXNoZWQgb3IgZmFpbGVkLCBub3RpZnkgdGhl IFVJIHByb2Nlc3MgdGhhdCB3ZSBhcmUgZG9uZSBpZiB0aGUgcGFnZSBoYXNuJ3QgYmVlbiBjbG9z ZWQuCi0gICAgaWYgKG1fd2ViUGFnZSkKLSAgICAgICAgbV93ZWJQYWdlLT5kaWRGaW5pc2hQcmlu dE9wZXJhdGlvbihlcnJvciwgbV9jYWxsYmFja0lEKTsKKyAgICBpZiAobV9jb21wbGV0aW9uSGFu ZGxlcikKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihlcnJvcik7CiB9CiAKIHZvaWQgV2Vi UHJpbnRPcGVyYXRpb25HdGs6OnByaW50KGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgZG91Ymxl IHhEUEksIGRvdWJsZSB5RFBJKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaAppbmRleCBiN2UxNDQ0Mjk0 YjI1MTI3ZDQ1MmYxMmE0OGIyZmFlODk1ODIwZjk2Li4wYTJlYjJlMjEyY2JlZWU2ZGQxY2E2MTBj OTA5MGVkMWI0NTdkNTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaApAQCAtMjksNiArMjksNyBA QAogI2luY2x1ZGUgIkNhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJQcmludEluZm8uaCIKICNpbmNs dWRlIDxXZWJDb3JlL1JlZlB0ckNhaXJvLmg+CisjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5k bGVyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgpAQCAtNzUsNyArNzYsNyBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGRpc2Nvbm5lY3RGcm9tUGFnZSgpOwogCi0gICAgdmlydHVhbCB2b2lk IHN0YXJ0UHJpbnQoV2ViQ29yZTo6UHJpbnRDb250ZXh0KiwgQ2FsbGJhY2tJRCkgPSAwOworICAg IHZpcnR1YWwgdm9pZCBzdGFydFByaW50KFdlYkNvcmU6OlByaW50Q29udGV4dCosIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpPiYmKSA9IDA7CiAK IHByb3RlY3RlZDoKICAgICBXZWJQcmludE9wZXJhdGlvbkd0ayhXZWJQYWdlKiwgY29uc3QgUHJp bnRJbmZvJik7CkBAIC0xMDMsNyArMTA0LDYgQEAgcHJvdGVjdGVkOgogICAgIEdSZWZQdHI8R3Rr UGFnZVNldHVwPiBtX3BhZ2VTZXR1cDsKICAgICBQcmludEluZm86OlByaW50TW9kZSBtX3ByaW50 TW9kZTsKICAgICBXZWJDb3JlOjpQcmludENvbnRleHQqIG1fcHJpbnRDb250ZXh0OwotICAgIENh bGxiYWNrSUQgbV9jYWxsYmFja0lEOwogICAgIFJlZlB0cjxjYWlyb190PiBtX2NhaXJvQ29udGV4 dDsKICAgICBkb3VibGUgbV94RFBJOwogICAgIGRvdWJsZSBtX3lEUEk7Cg== 419801 2021-02-09 18:09:17 -0800 2021-02-09 18:59:13 -0800 Patch bug-221643-20210209180916.patch text/plain 12699 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzI2MzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTA5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIENvbXBsZXRp b25IYW5kbGVyIGluc3RlYWQgb2YgUHJpbnRGaW5pc2hlZENhbGxiYWNrCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NDMKKworICAgICAgICBSZXZp ZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFByaW50T3BlcmF0aW9uLmNwcDoKKyAgICAgICAgKHdlYmtpdFByaW50T3BlcmF0aW9uUHJpbnRQ YWdlc0ZvckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkcmF3UGFnZXNGb3JQcmludGluZyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJpbnRGaW5pc2hlZENhbGxiYWNrKTogRGVsZXRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRyYXdQYWdlc0ZvclBy aW50aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkRmluaXNoUHJpbnRPcGVyYXRp b24pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByaW50T3BlcmF0aW9uR3RrOjpwcmludERvbmUpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaDoKKwogMjAyMS0w Mi0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10g QWRkIHN1cHBvcnQgZm9yIHRoZSBsYW5ndWFnZS9zdWJ0aXRsZSB0cmFja3MgYnV0dG9uIHVzaW5n IGBVSU1lbnVgCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyOTUsMTkgKzcyOTUsNiBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6bG9nU2Nyb2xsaW5nRXZlbnQodWluCiAgICAgfQogfQogCi0jaWYgUExBVEZPUk0oR1RL KQotdm9pZCBXZWJQYWdlUHJveHk6OnByaW50RmluaXNoZWRDYWxsYmFjayhjb25zdCBSZXNvdXJj ZUVycm9yJiBwcmludEVycm9yLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCi17Ci0gICAgYXV0byBj YWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8UHJpbnRGaW5pc2hlZENhbGxiYWNrPihjYWxsYmFj a0lEKTsKLSAgICBpZiAoIWNhbGxiYWNrKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBMb2cgZXJyb3Ig b3IgYXNzZXJ0LgotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgY2FsbGJhY2stPnBlcmZv cm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShBUEk6OkVycm9yOjpjcmVhdGUocHJpbnRFcnJvciku cHRyKCkpOwotfQotI2VuZGlmCi0KIHZvaWQgV2ViUGFnZVByb3h5Ojpmb2N1c2VkRnJhbWVDaGFu Z2VkKGNvbnN0IE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4mIGZyYW1lSUQpCiB7CiAgICAgaWYg KCFmcmFtZUlEKSB7CkBAIC04NTc2LDE3ICs4NTYzLDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk cmF3UGFnZXNUb1BERihXZWJGcmEKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEcmF3UGFn ZXNUb1BERihmcmFtZS0+ZnJhbWVJRCgpLCBwcmludEluZm8sIGZpcnN0LCBjb3VudCwgY2FsbGJh Y2tJRCksIHByaW50aW5nU2VuZE9wdGlvbnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlv bikpOwogfQogI2VsaWYgUExBVEZPUk0oR1RLKQotdm9pZCBXZWJQYWdlUHJveHk6OmRyYXdQYWdl c0ZvclByaW50aW5nKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBQcmludEluZm8mIHByaW50 SW5mbywgUmVmPFByaW50RmluaXNoZWRDYWxsYmFjaz4mJiBjYWxsYmFjaykKK3ZvaWQgV2ViUGFn ZVByb3h5OjpkcmF3UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3Qg UHJpbnRJbmZvJiBwcmludEluZm8sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoQVBJOjpFcnJvciop PiYmIGNhbGxiYWNrKQogewotICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewotICAgICAg ICBjYWxsYmFjay0+aW52YWxpZGF0ZSgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAg YXV0byBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKLSAgICBtX2NhbGxiYWNr cy5wdXQoV1RGTW92ZShjYWxsYmFjaykpOworICAgIGF1dG8gY2FsbGJhY2tXcmFwcGVyID0gW2Nh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JiBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgIGlmIChlcnJvci5pc051bGwoKSkKKyAgICAgICAg ICAgIHJldHVybiBjYWxsYmFjayhudWxscHRyKTsKKyAgICAgICAgY2FsbGJhY2soQVBJOjpFcnJv cjo6Y3JlYXRlKGVycm9yKS5wdHIoKSk7CisgICAgfTsKICAgICBtX2lzSW5QcmludGluZ01vZGUg PSB0cnVlOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRyYXdQYWdlc0ZvclByaW50aW5n KGZyYW1lLT5mcmFtZUlEKCksIHByaW50SW5mbywgY2FsbGJhY2tJRCksIHByaW50aW5nU2VuZE9w dGlvbnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbikpOworICAgIHNlbmRXaXRoQXN5 bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6RHJhd1BhZ2VzRm9yUHJpbnRpbmcoZnJhbWUtPmZy YW1lSUQoKSwgcHJpbnRJbmZvKSwgV1RGTW92ZShjYWxsYmFja1dyYXBwZXIpLCBwcmludGluZ1Nl bmRPcHRpb25zKG1faXNQZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24pKTsKIH0KICNlbmRpZgog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjcy NjMwKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTE4OCw2ICsxODgsNyBAQCBuYW1lc3BhY2UgQVBJIHsKIGNsYXNzIEF0dGFjaG1l bnQ7CiBjbGFzcyBDb250ZW50V29ybGQ7CiBjbGFzcyBDb250ZXh0TWVudUNsaWVudDsKK2NsYXNz IEVycm9yOwogY2xhc3MgRmluZENsaWVudDsKIGNsYXNzIEZpbmRNYXRjaGVzQ2xpZW50OwogY2xh c3MgRm9ybUNsaWVudDsKQEAgLTM4NiwxMCArMzg3LDYgQEAgdHlwZWRlZiBHZW5lcmljQ2FsbGJh Y2s8Y29uc3QgU3RyaW5nJj4gUwogdXNpbmcgTGF5ZXJIb3N0aW5nQ29udGV4dElEID0gdWludDMy X3Q7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdUSykKLXR5cGVkZWYgR2VuZXJpY0NhbGxiYWNr PEFQSTo6RXJyb3IqPiBQcmludEZpbmlzaGVkQ2FsbGJhY2s7Ci0jZW5kaWYKLQogI2lmIEVOQUJM RShUT1VDSF9FVkVOVFMpCiBzdHJ1Y3QgUXVldWVkVG91Y2hFdmVudHMgewogICAgIFF1ZXVlZFRv dWNoRXZlbnRzKGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50KQpAQCAtMTMwMSw3ICsx Mjk4LDcgQEAgcHVibGljOgogICAgIHN0ZDo6cGFpcjxzaXplX3QsIHVpbnQ2NF90PiBjb21wdXRl UGFnZXNGb3JQcmludGluZ0FuZERyYXdUb1BERihXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIsIGNv bnN0IFByaW50SW5mbyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgSVBDOjpEYXRhUmVm ZXJlbmNlJik+JiYpOwogI2VuZGlmCiAjZWxpZiBQTEFURk9STShHVEspCi0gICAgdm9pZCBkcmF3 UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgUmVmPFBy aW50RmluaXNoZWRDYWxsYmFjaz4mJik7CisgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmludGluZyhX ZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChB UEk6OkVycm9yKik+JiYpOwogI2VuZGlmCiAKICAgICBQYWdlTG9hZFN0YXRlJiBwYWdlTG9hZFN0 YXRlKCkgeyByZXR1cm4gbV9wYWdlTG9hZFN0YXRlOyB9CkBAIC0yMTc5LDkgKzIxNzYsNiBAQCBw cml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVTdHJpbmdGb3JGaW5kKGNvbnN0IFN0cmluZyYpOwog I2VuZGlmCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIHZvaWQgcHJpbnRGaW5pc2hlZENhbGxiYWNr KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBDYWxsYmFja0lEKTsKLSNlbmRpZgogCiAg ICAgdm9pZCBmb2N1c2VkRnJhbWVDaGFuZ2VkKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1l SWRlbnRpZmllcj4mKTsKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjcyNjMwKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0x ODQsOSArMTg0LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICNpZiBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCiAgICAgU2V0RGF0YURldGVjdGlvblJlc3VsdChzdHJ1Y3QgV2ViS2l0OjpE YXRhRGV0ZWN0aW9uUmVzdWx0IGRhdGFEZXRlY3Rpb25SZXN1bHQpCiAjZW5kaWYKLSNpZiBQTEFU Rk9STShHVEspCi0gICAgUHJpbnRGaW5pc2hlZENhbGxiYWNrKFdlYkNvcmU6OlJlc291cmNlRXJy b3IgZXJyb3IsIFdlYktpdDo6Q2FsbGJhY2tJRCBjYWxsYmFja0lEKQotI2VuZGlmCiAKICAgICBQ YWdlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoZG91YmxlIHNjYWxlRmFjdG9yKQogICAgIFBsdWdpblNj YWxlRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSB6b29tRmFjdG9yKQpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5j cHAJKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjYsOSArMzI2LDkg QEAgc3RhdGljIHZvaWQgd2Via2l0UHJpbnRPcGVyYXRpb25QcmludFBhZwogICAgIFByaW50SW5m byBwcmludEluZm8ocHJpbnRTZXR0aW5ncywgcGFnZVNldHVwLCBwcmludE9wZXJhdGlvbi0+cHJp di0+cHJpbnRNb2RlKTsKICAgICBhdXRvJiBwYWdlID0gd2Via2l0V2ViVmlld0dldFBhZ2UocHJp bnRPcGVyYXRpb24tPnByaXYtPndlYlZpZXcpOwogICAgIGdfb2JqZWN0X3JlZihwcmludE9wZXJh dGlvbik7Ci0gICAgcGFnZS5kcmF3UGFnZXNGb3JQcmludGluZyh3ZWJGcmFtZSwgcHJpbnRJbmZv LCBQcmludEZpbmlzaGVkQ2FsbGJhY2s6OmNyZWF0ZShbcHJpbnRPcGVyYXRpb25dKEFQSTo6RXJy b3IqIHByaW50RXJyb3IsIENhbGxiYWNrQmFzZTo6RXJyb3IpIHsKKyAgICBwYWdlLmRyYXdQYWdl c0ZvclByaW50aW5nKHdlYkZyYW1lLCBwcmludEluZm8sIFtwcmludE9wZXJhdGlvbl0oQVBJOjpF cnJvciogcHJpbnRFcnJvcikgewogICAgICAgICBkcmF3UGFnZXNGb3JQcmludGluZ0NvbXBsZXRl ZChwcmludEVycm9yLCBhZG9wdEdSZWYocHJpbnRPcGVyYXRpb24pLmdldCgpKTsKLSAgICB9KSk7 CisgICAgfSk7CiB9CiAKIFdlYktpdFByaW50T3BlcmF0aW9uUmVzcG9uc2Ugd2Via2l0UHJpbnRP cGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVy YXRpb24sIEd0a1dpbmRvdyogcGFyZW50LCBXZWJGcmFtZVByb3h5KiB3ZWJGcmFtZSkKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lv biAyNzI2MzApCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTI0MiwyMSArNTI0MiwxNyBAQCB2b2lkIFdlYlBhZ2U6OmRy YXdQYWdlc1RvUERGSW1wbChGcmFtZUlkCiB9CiAKICNlbGlmIFBMQVRGT1JNKEdUSykKLXZvaWQg V2ViUGFnZTo6ZHJhd1BhZ2VzRm9yUHJpbnRpbmcoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNv bnN0IFByaW50SW5mbyYgcHJpbnRJbmZvLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCit2b2lkIFdl YlBhZ2U6OmRyYXdQYWdlc0ZvclByaW50aW5nKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBjb25z dCBQcmludEluZm8mIHByaW50SW5mbywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgYmVnaW5Q cmludGluZyhmcmFtZUlELCBwcmludEluZm8pOwogICAgIGlmIChtX3ByaW50Q29udGV4dCAmJiBt X3ByaW50T3BlcmF0aW9uKSB7Ci0gICAgICAgIG1fcHJpbnRPcGVyYXRpb24tPnN0YXJ0UHJpbnQo bV9wcmludENvbnRleHQuZ2V0KCksIGNhbGxiYWNrSUQpOworICAgICAgICBtX3ByaW50T3BlcmF0 aW9uLT5zdGFydFByaW50KG1fcHJpbnRDb250ZXh0LmdldCgpLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXSAoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpIG11dGFibGUg eworICAgICAgICAgICAgbV9wcmludE9wZXJhdGlvbiA9IG51bGxwdHI7CisgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihlcnJvcik7CisgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CiAg ICAgfQotCi0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpWb2lkQ2FsbGJhY2soY2Fs bGJhY2tJRCkpOwotfQotCi12b2lkIFdlYlBhZ2U6OmRpZEZpbmlzaFByaW50T3BlcmF0aW9uKGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQp Ci17Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpQcmludEZpbmlzaGVkQ2FsbGJh Y2soZXJyb3IsIGNhbGxiYWNrSUQpKTsKLSAgICBtX3ByaW50T3BlcmF0aW9uID0gbnVsbHB0cjsK KyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogfQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDI3MjYzMCkKKysr IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5 KQpAQCAtOTgxLDggKzk4MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRyYXdUb1BERihXZWJDb3Jl OjpGcmFtZUlkZW50aWZpZXIsIGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4mLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpPiYmKTsKIAog I2lmIFBMQVRGT1JNKEdUSykKLSAgICB2b2lkIGRyYXdQYWdlc0ZvclByaW50aW5nKFdlYkNvcmU6 OkZyYW1lSWRlbnRpZmllciwgY29uc3QgUHJpbnRJbmZvJiwgQ2FsbGJhY2tJRCk7Ci0gICAgdm9p ZCBkaWRGaW5pc2hQcmludE9wZXJhdGlvbihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwg Q2FsbGJhY2tJRCk7CisgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmludGluZyhXZWJDb3JlOjpGcmFt ZUlkZW50aWZpZXIsIGNvbnN0IFByaW50SW5mbyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpPiYmKTsKICNlbmRpZgogCiAgICAgdm9pZCBhZGRS ZXNvdXJjZVJlcXVlc3QodW5zaWduZWQgbG9uZywgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAg LTQwOCw3ICs0MDgsNyBAQCBHZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKGVudW06dWlu CiAgICAgRHJhd1RvUERGKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBPcHRpb25h bDxXZWJDb3JlOjpGbG9hdFJlY3Q+IHJlY3QpIC0+IChJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkg QXN5bmMKICNlbmRpZgogI2lmIFBMQVRGT1JNKEdUSykKLSAgICBEcmF3UGFnZXNGb3JQcmludGlu ZyhXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgc3RydWN0IFdlYktpdDo6UHJpbnRJ bmZvIHByaW50SW5mbywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCisgICAgRHJhd1Bh Z2VzRm9yUHJpbnRpbmcoV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHN0cnVjdCBX ZWJLaXQ6OlByaW50SW5mbyBwcmludEluZm8pIC0+IChXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVy cm9yKSBBc3luYwogI2VuZGlmCiAKICAgICAjIE1lZGlhCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlv bkd0ay5jcHAJKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0 LDEwICs2NCwxMCBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIHZvaWQgc3RhcnRQcmlu dChXZWJDb3JlOjpQcmludENvbnRleHQqIHByaW50Q29udGV4dCwgQ2FsbGJhY2tJRCBjYWxsYmFj a0lEKSBvdmVycmlkZQorICAgIHZvaWQgc3RhcnRQcmludChXZWJDb3JlOjpQcmludENvbnRleHQq IHByaW50Q29udGV4dCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhhbmRsZXIpIG92ZXJyaWRlCiAgICAgewogICAgICAg ICBtX3ByaW50Q29udGV4dCA9IHByaW50Q29udGV4dDsKLSAgICAgICAgbV9jYWxsYmFja0lEID0g Y2FsbGJhY2tJRDsKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpOwogCiAgICAgICAgIFJlZlB0cjxQcmludGVyTGlzdEd0az4gcHJpbnRlckxp c3QgPSBQcmludGVyTGlzdEd0azo6Z2V0T3JDcmVhdGUoKTsKICAgICAgICAgQVNTRVJUKHByaW50 ZXJMaXN0KTsKQEAgLTE3Niw2ICsxNzYsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihwcmludEpvYkZpbmlzaGVk KSk7CiAgICAgfQogCisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yJik+IG1fY29tcGxldGlvbkhhbmRsZXI7CiAgICAgR1JlZlB0cjxHdGtQcmlu dEpvYj4gbV9wcmludEpvYjsKIH07CiAjZW5kaWYKQEAgLTE4OCwxMSArMTg5LDExIEBAIHB1Ymxp YzoKICAgICB7CiAgICAgfQogCi0gICAgdm9pZCBzdGFydFByaW50KFdlYkNvcmU6OlByaW50Q29u dGV4dCogcHJpbnRDb250ZXh0LCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpIG92ZXJyaWRlCisgICAg dm9pZCBzdGFydFByaW50KFdlYkNvcmU6OlByaW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKT4mJiBjb21w bGV0aW9uSGFuZGxlcikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIG1fcHJpbnRDb250ZXh0ID0g cHJpbnRDb250ZXh0OwotICAgICAgICBtX2NhbGxiYWNrSUQgPSBjYWxsYmFja0lEOwogICAgICAg ICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogICAg IH0KIAogICAgIHZvaWQgc3RhcnRQYWdlKGNhaXJvX3QqIGNyKSBvdmVycmlkZQpAQCAtNzE5LDgg KzcyMCw4IEBAIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50RG9uZShjb24KICAgICBt X3ByaW50UGFnZXNJZGxlSWQgPSAwOwogCiAgICAgLy8gUHJpbnQgZmluaXNoZWQgb3IgZmFpbGVk LCBub3RpZnkgdGhlIFVJIHByb2Nlc3MgdGhhdCB3ZSBhcmUgZG9uZSBpZiB0aGUgcGFnZSBoYXNu J3QgYmVlbiBjbG9zZWQuCi0gICAgaWYgKG1fd2ViUGFnZSkKLSAgICAgICAgbV93ZWJQYWdlLT5k aWRGaW5pc2hQcmludE9wZXJhdGlvbihlcnJvciwgbV9jYWxsYmFja0lEKTsKKyAgICBpZiAobV9j b21wbGV0aW9uSGFuZGxlcikKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihlcnJvcik7CiB9 CiAKIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50KGNhaXJvX3N1cmZhY2VfdCogc3Vy ZmFjZSwgZG91YmxlIHhEUEksIGRvdWJsZSB5RFBJKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3Rr LmgJKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3 IEBACiAjaW5jbHVkZSAiQ2FsbGJhY2tJRC5oIgogI2luY2x1ZGUgIlByaW50SW5mby5oIgogI2lu Y2x1ZGUgPFdlYkNvcmUvUmVmUHRyQ2Fpcm8uaD4KKyNpbmNsdWRlIDx3dGYvQ29tcGxldGlvbkhh bmRsZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQ dHIuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVmUHRyLmg+CkBAIC03NSw3ICs3Niw3IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgZGlzY29ubmVjdEZyb21QYWdlKCk7CiAKLSAgICB2aXJ0dWFsIHZv aWQgc3RhcnRQcmludChXZWJDb3JlOjpQcmludENvbnRleHQqLCBDYWxsYmFja0lEKSA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIHN0YXJ0UHJpbnQoV2ViQ29yZTo6UHJpbnRDb250ZXh0KiwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+JiYpID0gMDsK IAogcHJvdGVjdGVkOgogICAgIFdlYlByaW50T3BlcmF0aW9uR3RrKFdlYlBhZ2UqLCBjb25zdCBQ cmludEluZm8mKTsKQEAgLTEwMyw3ICsxMDQsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgR1JlZlB0cjxH dGtQYWdlU2V0dXA+IG1fcGFnZVNldHVwOwogICAgIFByaW50SW5mbzo6UHJpbnRNb2RlIG1fcHJp bnRNb2RlOwogICAgIFdlYkNvcmU6OlByaW50Q29udGV4dCogbV9wcmludENvbnRleHQ7Ci0gICAg Q2FsbGJhY2tJRCBtX2NhbGxiYWNrSUQ7CiAgICAgUmVmUHRyPGNhaXJvX3Q+IG1fY2Fpcm9Db250 ZXh0OwogICAgIGRvdWJsZSBtX3hEUEk7CiAgICAgZG91YmxlIG1feURQSTsK 419804 2021-02-09 18:59:15 -0800 2021-02-09 19:06:36 -0800 Patch bug-221643-20210209185914.patch text/plain 12531 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzI2MzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTA5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIENvbXBsZXRp b25IYW5kbGVyIGluc3RlYWQgb2YgUHJpbnRGaW5pc2hlZENhbGxiYWNrCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NDMKKworICAgICAgICBSZXZp ZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFByaW50T3BlcmF0aW9uLmNwcDoKKyAgICAgICAgKHdlYmtpdFByaW50T3BlcmF0aW9uUHJpbnRQ YWdlc0ZvckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkcmF3UGFnZXNGb3JQcmludGluZyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJpbnRGaW5pc2hlZENhbGxiYWNrKTogRGVsZXRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRyYXdQYWdlc0ZvclBy aW50aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkRmluaXNoUHJpbnRPcGVyYXRp b24pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByaW50T3BlcmF0aW9uR3RrOjpwcmludERvbmUpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaDoKKwogMjAyMS0w Mi0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10g QWRkIHN1cHBvcnQgZm9yIHRoZSBsYW5ndWFnZS9zdWJ0aXRsZSB0cmFja3MgYnV0dG9uIHVzaW5n IGBVSU1lbnVgCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyOTUsMTkgKzcyOTUsNiBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6bG9nU2Nyb2xsaW5nRXZlbnQodWluCiAgICAgfQogfQogCi0jaWYgUExBVEZPUk0oR1RL KQotdm9pZCBXZWJQYWdlUHJveHk6OnByaW50RmluaXNoZWRDYWxsYmFjayhjb25zdCBSZXNvdXJj ZUVycm9yJiBwcmludEVycm9yLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCi17Ci0gICAgYXV0byBj YWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8UHJpbnRGaW5pc2hlZENhbGxiYWNrPihjYWxsYmFj a0lEKTsKLSAgICBpZiAoIWNhbGxiYWNrKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBMb2cgZXJyb3Ig b3IgYXNzZXJ0LgotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgY2FsbGJhY2stPnBlcmZv cm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShBUEk6OkVycm9yOjpjcmVhdGUocHJpbnRFcnJvciku cHRyKCkpOwotfQotI2VuZGlmCi0KIHZvaWQgV2ViUGFnZVByb3h5Ojpmb2N1c2VkRnJhbWVDaGFu Z2VkKGNvbnN0IE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4mIGZyYW1lSUQpCiB7CiAgICAgaWYg KCFmcmFtZUlEKSB7CkBAIC04NTc2LDE3ICs4NTYzLDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk cmF3UGFnZXNUb1BERihXZWJGcmEKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEcmF3UGFn ZXNUb1BERihmcmFtZS0+ZnJhbWVJRCgpLCBwcmludEluZm8sIGZpcnN0LCBjb3VudCwgY2FsbGJh Y2tJRCksIHByaW50aW5nU2VuZE9wdGlvbnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlv bikpOwogfQogI2VsaWYgUExBVEZPUk0oR1RLKQotdm9pZCBXZWJQYWdlUHJveHk6OmRyYXdQYWdl c0ZvclByaW50aW5nKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBQcmludEluZm8mIHByaW50 SW5mbywgUmVmPFByaW50RmluaXNoZWRDYWxsYmFjaz4mJiBjYWxsYmFjaykKK3ZvaWQgV2ViUGFn ZVByb3h5OjpkcmF3UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3Qg UHJpbnRJbmZvJiBwcmludEluZm8sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoQVBJOjpFcnJvciop PiYmIGNhbGxiYWNrKQogewotICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewotICAgICAg ICBjYWxsYmFjay0+aW52YWxpZGF0ZSgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAg YXV0byBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKLSAgICBtX2NhbGxiYWNr cy5wdXQoV1RGTW92ZShjYWxsYmFjaykpOworICAgIGF1dG8gY2FsbGJhY2tXcmFwcGVyID0gW2Nh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JiBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgIGlmIChlcnJvci5pc051bGwoKSkKKyAgICAgICAg ICAgIHJldHVybiBjYWxsYmFjayhudWxscHRyKTsKKyAgICAgICAgY2FsbGJhY2soQVBJOjpFcnJv cjo6Y3JlYXRlKGVycm9yKS5wdHIoKSk7CisgICAgfTsKICAgICBtX2lzSW5QcmludGluZ01vZGUg PSB0cnVlOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRyYXdQYWdlc0ZvclByaW50aW5n KGZyYW1lLT5mcmFtZUlEKCksIHByaW50SW5mbywgY2FsbGJhY2tJRCksIHByaW50aW5nU2VuZE9w dGlvbnMobV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbikpOworICAgIHNlbmRXaXRoQXN5 bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6RHJhd1BhZ2VzRm9yUHJpbnRpbmcoZnJhbWUtPmZy YW1lSUQoKSwgcHJpbnRJbmZvKSwgV1RGTW92ZShjYWxsYmFja1dyYXBwZXIpLCBwcmludGluZ1Nl bmRPcHRpb25zKG1faXNQZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24pKTsKIH0KICNlbmRpZgog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjcy NjMwKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTE4OCw2ICsxODgsNyBAQCBuYW1lc3BhY2UgQVBJIHsKIGNsYXNzIEF0dGFjaG1l bnQ7CiBjbGFzcyBDb250ZW50V29ybGQ7CiBjbGFzcyBDb250ZXh0TWVudUNsaWVudDsKK2NsYXNz IEVycm9yOwogY2xhc3MgRmluZENsaWVudDsKIGNsYXNzIEZpbmRNYXRjaGVzQ2xpZW50OwogY2xh c3MgRm9ybUNsaWVudDsKQEAgLTM4NiwxMCArMzg3LDYgQEAgdHlwZWRlZiBHZW5lcmljQ2FsbGJh Y2s8Y29uc3QgU3RyaW5nJj4gUwogdXNpbmcgTGF5ZXJIb3N0aW5nQ29udGV4dElEID0gdWludDMy X3Q7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdUSykKLXR5cGVkZWYgR2VuZXJpY0NhbGxiYWNr PEFQSTo6RXJyb3IqPiBQcmludEZpbmlzaGVkQ2FsbGJhY2s7Ci0jZW5kaWYKLQogI2lmIEVOQUJM RShUT1VDSF9FVkVOVFMpCiBzdHJ1Y3QgUXVldWVkVG91Y2hFdmVudHMgewogICAgIFF1ZXVlZFRv dWNoRXZlbnRzKGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50KQpAQCAtMTMwMSw3ICsx Mjk4LDcgQEAgcHVibGljOgogICAgIHN0ZDo6cGFpcjxzaXplX3QsIHVpbnQ2NF90PiBjb21wdXRl UGFnZXNGb3JQcmludGluZ0FuZERyYXdUb1BERihXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIsIGNv bnN0IFByaW50SW5mbyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgSVBDOjpEYXRhUmVm ZXJlbmNlJik+JiYpOwogI2VuZGlmCiAjZWxpZiBQTEFURk9STShHVEspCi0gICAgdm9pZCBkcmF3 UGFnZXNGb3JQcmludGluZyhXZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgUmVmPFBy aW50RmluaXNoZWRDYWxsYmFjaz4mJik7CisgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmludGluZyhX ZWJGcmFtZVByb3h5KiwgY29uc3QgUHJpbnRJbmZvJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChB UEk6OkVycm9yKik+JiYpOwogI2VuZGlmCiAKICAgICBQYWdlTG9hZFN0YXRlJiBwYWdlTG9hZFN0 YXRlKCkgeyByZXR1cm4gbV9wYWdlTG9hZFN0YXRlOyB9CkBAIC0yMTc5LDkgKzIxNzYsNiBAQCBw cml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVTdHJpbmdGb3JGaW5kKGNvbnN0IFN0cmluZyYpOwog I2VuZGlmCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIHZvaWQgcHJpbnRGaW5pc2hlZENhbGxiYWNr KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBDYWxsYmFja0lEKTsKLSNlbmRpZgogCiAg ICAgdm9pZCBmb2N1c2VkRnJhbWVDaGFuZ2VkKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1l SWRlbnRpZmllcj4mKTsKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjcyNjMwKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0x ODQsOSArMTg0LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICNpZiBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCiAgICAgU2V0RGF0YURldGVjdGlvblJlc3VsdChzdHJ1Y3QgV2ViS2l0OjpE YXRhRGV0ZWN0aW9uUmVzdWx0IGRhdGFEZXRlY3Rpb25SZXN1bHQpCiAjZW5kaWYKLSNpZiBQTEFU Rk9STShHVEspCi0gICAgUHJpbnRGaW5pc2hlZENhbGxiYWNrKFdlYkNvcmU6OlJlc291cmNlRXJy b3IgZXJyb3IsIFdlYktpdDo6Q2FsbGJhY2tJRCBjYWxsYmFja0lEKQotI2VuZGlmCiAKICAgICBQ YWdlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoZG91YmxlIHNjYWxlRmFjdG9yKQogICAgIFBsdWdpblNj YWxlRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSB6b29tRmFjdG9yKQpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5j cHAJKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjYsOSArMzI2LDkg QEAgc3RhdGljIHZvaWQgd2Via2l0UHJpbnRPcGVyYXRpb25QcmludFBhZwogICAgIFByaW50SW5m byBwcmludEluZm8ocHJpbnRTZXR0aW5ncywgcGFnZVNldHVwLCBwcmludE9wZXJhdGlvbi0+cHJp di0+cHJpbnRNb2RlKTsKICAgICBhdXRvJiBwYWdlID0gd2Via2l0V2ViVmlld0dldFBhZ2UocHJp bnRPcGVyYXRpb24tPnByaXYtPndlYlZpZXcpOwogICAgIGdfb2JqZWN0X3JlZihwcmludE9wZXJh dGlvbik7Ci0gICAgcGFnZS5kcmF3UGFnZXNGb3JQcmludGluZyh3ZWJGcmFtZSwgcHJpbnRJbmZv LCBQcmludEZpbmlzaGVkQ2FsbGJhY2s6OmNyZWF0ZShbcHJpbnRPcGVyYXRpb25dKEFQSTo6RXJy b3IqIHByaW50RXJyb3IsIENhbGxiYWNrQmFzZTo6RXJyb3IpIHsKKyAgICBwYWdlLmRyYXdQYWdl c0ZvclByaW50aW5nKHdlYkZyYW1lLCBwcmludEluZm8sIFtwcmludE9wZXJhdGlvbl0oQVBJOjpF cnJvciogcHJpbnRFcnJvcikgewogICAgICAgICBkcmF3UGFnZXNGb3JQcmludGluZ0NvbXBsZXRl ZChwcmludEVycm9yLCBhZG9wdEdSZWYocHJpbnRPcGVyYXRpb24pLmdldCgpKTsKLSAgICB9KSk7 CisgICAgfSk7CiB9CiAKIFdlYktpdFByaW50T3BlcmF0aW9uUmVzcG9uc2Ugd2Via2l0UHJpbnRP cGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVy YXRpb24sIEd0a1dpbmRvdyogcGFyZW50LCBXZWJGcmFtZVByb3h5KiB3ZWJGcmFtZSkKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lv biAyNzI2MzApCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTI0MiwyMSArNTI0MiwxNyBAQCB2b2lkIFdlYlBhZ2U6OmRy YXdQYWdlc1RvUERGSW1wbChGcmFtZUlkCiB9CiAKICNlbGlmIFBMQVRGT1JNKEdUSykKLXZvaWQg V2ViUGFnZTo6ZHJhd1BhZ2VzRm9yUHJpbnRpbmcoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNv bnN0IFByaW50SW5mbyYgcHJpbnRJbmZvLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCit2b2lkIFdl YlBhZ2U6OmRyYXdQYWdlc0ZvclByaW50aW5nKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBjb25z dCBQcmludEluZm8mIHByaW50SW5mbywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgYmVnaW5Q cmludGluZyhmcmFtZUlELCBwcmludEluZm8pOwogICAgIGlmIChtX3ByaW50Q29udGV4dCAmJiBt X3ByaW50T3BlcmF0aW9uKSB7Ci0gICAgICAgIG1fcHJpbnRPcGVyYXRpb24tPnN0YXJ0UHJpbnQo bV9wcmludENvbnRleHQuZ2V0KCksIGNhbGxiYWNrSUQpOworICAgICAgICBtX3ByaW50T3BlcmF0 aW9uLT5zdGFydFByaW50KG1fcHJpbnRDb250ZXh0LmdldCgpLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXSAoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpIG11dGFibGUg eworICAgICAgICAgICAgbV9wcmludE9wZXJhdGlvbiA9IG51bGxwdHI7CisgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihlcnJvcik7CisgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CiAg ICAgfQotCi0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpWb2lkQ2FsbGJhY2soY2Fs bGJhY2tJRCkpOwotfQotCi12b2lkIFdlYlBhZ2U6OmRpZEZpbmlzaFByaW50T3BlcmF0aW9uKGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQp Ci17Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpQcmludEZpbmlzaGVkQ2FsbGJh Y2soZXJyb3IsIGNhbGxiYWNrSUQpKTsKLSAgICBtX3ByaW50T3BlcmF0aW9uID0gbnVsbHB0cjsK KyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogfQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDI3MjYzMCkKKysr IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5 KQpAQCAtOTgxLDggKzk4MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRyYXdUb1BERihXZWJDb3Jl OjpGcmFtZUlkZW50aWZpZXIsIGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4mLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpPiYmKTsKIAog I2lmIFBMQVRGT1JNKEdUSykKLSAgICB2b2lkIGRyYXdQYWdlc0ZvclByaW50aW5nKFdlYkNvcmU6 OkZyYW1lSWRlbnRpZmllciwgY29uc3QgUHJpbnRJbmZvJiwgQ2FsbGJhY2tJRCk7Ci0gICAgdm9p ZCBkaWRGaW5pc2hQcmludE9wZXJhdGlvbihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwg Q2FsbGJhY2tJRCk7CisgICAgdm9pZCBkcmF3UGFnZXNGb3JQcmludGluZyhXZWJDb3JlOjpGcmFt ZUlkZW50aWZpZXIsIGNvbnN0IFByaW50SW5mbyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpPiYmKTsKICNlbmRpZgogCiAgICAgdm9pZCBhZGRS ZXNvdXJjZVJlcXVlc3QodW5zaWduZWQgbG9uZywgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAg LTQwOCw3ICs0MDgsNyBAQCBHZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKGVudW06dWlu CiAgICAgRHJhd1RvUERGKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBPcHRpb25h bDxXZWJDb3JlOjpGbG9hdFJlY3Q+IHJlY3QpIC0+IChJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkg QXN5bmMKICNlbmRpZgogI2lmIFBMQVRGT1JNKEdUSykKLSAgICBEcmF3UGFnZXNGb3JQcmludGlu ZyhXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgc3RydWN0IFdlYktpdDo6UHJpbnRJ bmZvIHByaW50SW5mbywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCisgICAgRHJhd1Bh Z2VzRm9yUHJpbnRpbmcoV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHN0cnVjdCBX ZWJLaXQ6OlByaW50SW5mbyBwcmludEluZm8pIC0+IChXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVy cm9yKSBBc3luYwogI2VuZGlmCiAKICAgICAjIE1lZGlhCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlv bkd0ay5jcHAJKHJldmlzaW9uIDI3MjYzMCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0 LDEwICs2NCwxMCBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIHZvaWQgc3RhcnRQcmlu dChXZWJDb3JlOjpQcmludENvbnRleHQqIHByaW50Q29udGV4dCwgQ2FsbGJhY2tJRCBjYWxsYmFj a0lEKSBvdmVycmlkZQorICAgIHZvaWQgc3RhcnRQcmludChXZWJDb3JlOjpQcmludENvbnRleHQq IHByaW50Q29udGV4dCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJik+JiYgY29tcGxldGlvbkhhbmRsZXIpIG92ZXJyaWRlCiAgICAgewogICAgICAg ICBtX3ByaW50Q29udGV4dCA9IHByaW50Q29udGV4dDsKLSAgICAgICAgbV9jYWxsYmFja0lEID0g Y2FsbGJhY2tJRDsKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpOwogCiAgICAgICAgIFJlZlB0cjxQcmludGVyTGlzdEd0az4gcHJpbnRlckxp c3QgPSBQcmludGVyTGlzdEd0azo6Z2V0T3JDcmVhdGUoKTsKICAgICAgICAgQVNTRVJUKHByaW50 ZXJMaXN0KTsKQEAgLTE4OCwxMSArMTg4LDExIEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0g ICAgdm9pZCBzdGFydFByaW50KFdlYkNvcmU6OlByaW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBD YWxsYmFja0lEIGNhbGxiYWNrSUQpIG92ZXJyaWRlCisgICAgdm9pZCBzdGFydFByaW50KFdlYkNv cmU6OlByaW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgb3ZlcnJp ZGUKICAgICB7CiAgICAgICAgIG1fcHJpbnRDb250ZXh0ID0gcHJpbnRDb250ZXh0OwotICAgICAg ICBtX2NhbGxiYWNrSUQgPSBjYWxsYmFja0lEOwogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogICAgIH0KIAogICAgIHZvaWQgc3RhcnRQ YWdlKGNhaXJvX3QqIGNyKSBvdmVycmlkZQpAQCAtNzE5LDggKzcxOSw4IEBAIHZvaWQgV2ViUHJp bnRPcGVyYXRpb25HdGs6OnByaW50RG9uZShjb24KICAgICBtX3ByaW50UGFnZXNJZGxlSWQgPSAw OwogCiAgICAgLy8gUHJpbnQgZmluaXNoZWQgb3IgZmFpbGVkLCBub3RpZnkgdGhlIFVJIHByb2Nl c3MgdGhhdCB3ZSBhcmUgZG9uZSBpZiB0aGUgcGFnZSBoYXNuJ3QgYmVlbiBjbG9zZWQuCi0gICAg aWYgKG1fd2ViUGFnZSkKLSAgICAgICAgbV93ZWJQYWdlLT5kaWRGaW5pc2hQcmludE9wZXJhdGlv bihlcnJvciwgbV9jYWxsYmFja0lEKTsKKyAgICBpZiAobV9jb21wbGV0aW9uSGFuZGxlcikKKyAg ICAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihlcnJvcik7CiB9CiAKIHZvaWQgV2ViUHJpbnRPcGVy YXRpb25HdGs6OnByaW50KGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgZG91YmxlIHhEUEksIGRv dWJsZSB5RFBJKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dl YlByaW50T3BlcmF0aW9uR3RrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmgJKHJldmlzaW9uIDI3MjYzMCkK KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlv bkd0ay5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiQ2FsbGJh Y2tJRC5oIgogI2luY2x1ZGUgIlByaW50SW5mby5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVmUHRy Q2Fpcm8uaD4KKyNpbmNsdWRlIDx3dGYvQ29tcGxldGlvbkhhbmRsZXIuaD4KICNpbmNsdWRlIDx3 dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYv Z2xpYi9HUmVmUHRyLmg+CkBAIC03NSw3ICs3Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGlz Y29ubmVjdEZyb21QYWdlKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc3RhcnRQcmludChXZWJDb3Jl OjpQcmludENvbnRleHQqLCBDYWxsYmFja0lEKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0 UHJpbnQoV2ViQ29yZTo6UHJpbnRDb250ZXh0KiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25z dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik+JiYpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIFdl YlByaW50T3BlcmF0aW9uR3RrKFdlYlBhZ2UqLCBjb25zdCBQcmludEluZm8mKTsKQEAgLTEwMyw3 ICsxMDQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgR1JlZlB0cjxHdGtQYWdlU2V0dXA+IG1fcGFnZVNl dHVwOwogICAgIFByaW50SW5mbzo6UHJpbnRNb2RlIG1fcHJpbnRNb2RlOwogICAgIFdlYkNvcmU6 OlByaW50Q29udGV4dCogbV9wcmludENvbnRleHQ7Ci0gICAgQ2FsbGJhY2tJRCBtX2NhbGxiYWNr SUQ7CisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yJik+IG1fY29tcGxldGlvbkhhbmRsZXI7CiAgICAgUmVmUHRyPGNhaXJvX3Q+IG1fY2Fpcm9D b250ZXh0OwogICAgIGRvdWJsZSBtX3hEUEk7CiAgICAgZG91YmxlIG1feURQSTsK