232458 2021-10-28 15:20:25 -0700 Use higher QoS for WheelEvent and DisplayWasRefreshed IPCs 2021-11-02 08:43:09 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen benjamin cmarcelo ews-watchlist ggaren kkinnunen simon.fraser webkit-bug-importer oldest_to_newest 1809864 0 cdumez 2021-10-28 15:20:25 -0700 Use higher QoS for WheelEvent and DisplayWasRefreshed IPCs since those are high priority. The UIProcess's main thread has high UserInteractive QoS but the IPC thread has a lower QoS by default. We cannot raise the QoS of the IPC thread without regressing some performance benchmarks since not all IPC is high priority. 1809865 1 cdumez 2021-10-28 15:20:46 -0700 <rdar://82657744> 1809866 2 442751 cdumez 2021-10-28 15:23:24 -0700 Created attachment 442751 Patch 1810164 3 cdumez 2021-10-29 11:20:23 -0700 This is causing WKWebView.PrepareForMoveToWindowThenClose API test to fail. I am investigating. 1810189 4 442850 cdumez 2021-10-29 12:42:51 -0700 Created attachment 442850 Patch 1810266 5 442867 cdumez 2021-10-29 14:59:52 -0700 Created attachment 442867 Patch 1811128 6 ews-feeder 2021-11-02 08:43:06 -0700 Committed r285159 (243795@main): <https://commits.webkit.org/243795@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442867. 442751 2021-10-28 15:23:24 -0700 2021-10-29 12:42:49 -0700 Patch bug-232458-20211028152323.patch text/plain 12381 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNmNzlmMzQ2YzE0YzBhM2VlNzdiNDk4 M2RkNzU0NGU4NzQwMjE5OTYuLmIwNDNhNzA4ZGIwZTRkMjliMDdjMmExYmE2YTNhNDE2MTkwNWM2 NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMTAtMjggIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaGlnaGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQg RGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI0NTgKKyAgICAgICAgPHJkYXI6Ly84MjY1Nzc0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZGlzcGF0Y2hX aXRoUU9TKCkgZnVuY3Rpb24gdG8gV29ya1F1ZXVlIHRvIGRpc3BhdGNoIGEgdGFzayB3aXRoIGEg Z2l2ZW4gUW9TLgorCisgICAgICAgICogd3RmL1dvcmtRdWV1ZS5jcHA6CisgICAgICAgIChXVEY6 OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisgICAgICAgICogd3RmL1dvcmtRdWV1 ZS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9Xb3JrUXVldWVDb2NvYS5jcHA6CisgICAgICAgIChX VEY6OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisKIDIwMjEtMTAtMjggIE5pa29s YW9zIE1vdWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxl IGxhenkgaW1hZ2UgbG9hZGluZyBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdmMzM1NWQxZThmM2M3 NmQyZjhhODZlNzcwYjdiNTkyYTQ0NmI1ZDkuLjVkZDJmMTQzYzk0ZWViNDljZmIzOWE1NTM2YTc2 NTFiNDNlMzU3MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMTAtMjggIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaGlnaGVyIFFvUyBmb3Ig V2hlZWxFdmVudCBhbmQgRGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NTgKKyAgICAgICAgPHJkYXI6Ly84 MjY1Nzc0ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgaGlnaGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQgRGlzcGxheVdhc1JlZnJlc2hlZCBJ UENzIHNpbmNlIHRob3NlIGFyZSBoaWdoIHByaW9yaXR5LiBUaGUKKyAgICAgICAgVUlQcm9jZXNz J3MgbWFpbiB0aHJlYWQgaGFzIGhpZ2ggVXNlckludGVyYWN0aXZlIFFvUyBidXQgdGhlIElQQyB0 aHJlYWQgaGFzIGEgbG93ZXIgUW9TIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgV2UgY2Fubm90IHJh aXNlIHRoZSBRb1Mgb2YgdGhlIElQQyB0aHJlYWQgd2l0aG91dCByZWdyZXNzaW5nIHNvbWUgcGVy Zm9ybWFuY2UgYmVuY2htYXJrcyBzaW5jZSBub3QKKyAgICAgICAgYWxsIElQQyBpcyBoaWdoIHBy aW9yaXR5LgorCisgICAgICAgIE1ha2luZyB0aGlzIGNoYW5nZSBoZWxwcyB3aXRoIHJlc3BvbnNp dmVuZXNzIHVuZGVyIGhlYXZ5IGxvYWQgc2NlbmFyaW9zLgorCisgICAgICAgICogUGxhdGZvcm0v SVBDL0Nvbm5lY3Rpb24uY3BwOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpzZW5kTWVzc2Fn ZSk6CisgICAgICAgICogUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaDoKKyAgICAgICAgKElQQzo6 Q29ubmVjdGlvbjo6c2VuZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2VuZFdoZWVsRXZlbnQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvRGlzcGxheUxpbmsuY3BwOgorICAgICAgICAoV2ViS2l0OjpEaXNw bGF5TGluazo6bm90aWZ5T2JzZXJ2ZXJzRGlzcGxheVdhc1JlZnJlc2hlZCk6CisKIDIwMjEtMTAt MjggIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXVtRdF0gRG8gbm90IHVzZSBXZWJLaXQgaW50ZXJuYWxzIGluIHRoZSBpbXBsZW1lbnRh dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvV29ya1F1ZXVlLmNwcCBiL1NvdXJjZS9X VEYvd3RmL1dvcmtRdWV1ZS5jcHAKaW5kZXggMjhlOWE3YTkzYjNjMmE5MTNiZTcwMzBkMDBmODAx ZWRiMzg0ODA1YS4uOWUxMDZlMzk0ZDNmNDRkMmMyNWZjM2NhMTUzNTQwZTUyMDRjYjM1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi93dGYvV29ya1F1ZXVlLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0 Zi9Xb3JrUXVldWUuY3BwCkBAIC04MSw2ICs4MSwxMSBAQCB2b2lkIFdvcmtRdWV1ZUJhc2U6OmRp c3BhdGNoU3luYyhGdW5jdGlvbjx2b2lkKCk+JiYgZnVuY3Rpb24pCiAgICAgc2VtYXBob3JlLndh aXQoKTsKIH0KIAordm9pZCBXb3JrUXVldWVCYXNlOjpkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248 dm9pZCgpPiYmIGZ1bmN0aW9uLCBRT1MpCit7CisgICAgZGlzcGF0Y2goV1RGTW92ZShmdW5jdGlv bikpOworfQorCiB2b2lkIENvbmN1cnJlbnRXb3JrUXVldWU6OmFwcGx5KHNpemVfdCBpdGVyYXRp b25zLCBXVEY6OkZ1bmN0aW9uPHZvaWQoc2l6ZV90IGluZGV4KT4mJiBmdW5jdGlvbikKIHsKICAg ICBpZiAoIWl0ZXJhdGlvbnMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUu aCBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCmluZGV4IDk4Y2UzY2I4MWE3Y2E0YzViMjQw NGQxZTIwM2RkZWE3OTJiY2VlNjEuLjM2OGMwNjZkOGY5NmI0YmNlNzQzMTgyNTJlM2MwMjY2NjFk OGY2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCisrKyBiL1NvdXJj ZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCkBAIC00OCw2ICs0OCw3IEBAIHB1YmxpYzoKICAgICB+V29y a1F1ZXVlQmFzZSgpIG92ZXJyaWRlOwogCiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGlz cGF0Y2goRnVuY3Rpb248dm9pZCgpPiYmKSBvdmVycmlkZTsKKyAgICBXVEZfRVhQT1JUX1BSSVZB VEUgdm9pZCBkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmLCBRT1MpOwogICAgIFdU Rl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hBZnRlcihTZWNvbmRzLCBGdW5j dGlvbjx2b2lkKCk+JiYpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgZGlz cGF0Y2hTeW5jKEZ1bmN0aW9uPHZvaWQoKT4mJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYv d3RmL2NvY29hL1dvcmtRdWV1ZUNvY29hLmNwcCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1dvcmtR dWV1ZUNvY29hLmNwcAppbmRleCBiMDg1YWY3OGZkNTk1NGYzNmNkNzgwOGQ2MjAwZDJmOTgwY2Ji OTcyLi43MWMwOThjNDgyMDQ0ZGE5ZjIxZmM5MjU4ZDQwZTU3MGM2YmMyYTgyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9Xb3JrUXVldWVDb2NvYS5jcHAKKysrIGIvU291cmNlL1dU Ri93dGYvY29jb2EvV29ya1F1ZXVlQ29jb2EuY3BwCkBAIC01NCw2ICs1NCwxMyBAQCB2b2lkIFdv cmtRdWV1ZUJhc2U6OmRpc3BhdGNoKEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKICAgICBk aXNwYXRjaF9hc3luY19mKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgbmV3IERpc3BhdGNoV29ya0l0 ZW0geyBSZWYgeyAqdGhpcyB9LCBXVEZNb3ZlKGZ1bmN0aW9uKSB9LCBkaXNwYXRjaFdvcmtJdGVt PERpc3BhdGNoV29ya0l0ZW0+KTsKIH0KIAordm9pZCBXb3JrUXVldWVCYXNlOjpkaXNwYXRjaFdp dGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBRT1MgcW9zKQoreworICAgIGRpc3Bh dGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgZGlzcGF0Y2hfYmxvY2tfY3JlYXRlX3dp dGhfcW9zX2NsYXNzKERJU1BBVENIX0JMT0NLX0VORk9SQ0VfUU9TX0NMQVNTLCBUaHJlYWQ6OmRp c3BhdGNoUU9TQ2xhc3MocW9zKSwgMCwgbWFrZUJsb2NrUHRyKFtmdW5jdGlvbiA9IFdURk1vdmUo ZnVuY3Rpb24pXSB7CisgICAgICAgIGZ1bmN0aW9uKCk7CisgICAgfSkuZ2V0KCkpKTsKK30KKwog dm9pZCBXb3JrUXVldWVCYXNlOjpkaXNwYXRjaEFmdGVyKFNlY29uZHMgZHVyYXRpb24sIEZ1bmN0 aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKIHsKICAgICBkaXNwYXRjaF9hZnRlcl9mKGRpc3BhdGNo X3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIGR1cmF0aW9uLm5hbm9zZWNvbmRzQXM8aW50NjRfdD4o KSksIG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgbmV3IERpc3BhdGNoV29ya0l0ZW0geyBSZWYgeyAq dGhpcyB9LCAgV1RGTW92ZShmdW5jdGlvbikgfSwgZGlzcGF0Y2hXb3JrSXRlbTxEaXNwYXRjaFdv cmtJdGVtPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCmluZGV4 IGI4YTNlYTY1M2Y0ODRiNDY0MGQzMjM0YzllZDNhN2Y2ODU0MDA2ZTguLmQzNGE0NDJhMzZlNDkw YjNkYWFiZTZiNzQyZjAyZDA0YmRiYzRlNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxh dGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBD L0Nvbm5lY3Rpb24uY3BwCkBAIC00NTMsNyArNDUzLDcgQEAgVW5pcXVlUmVmPEVuY29kZXI+IENv bm5lY3Rpb246OmNyZWF0ZVN5bmNNZXNzYWdlRW5jb2RlcihNZXNzYWdlTmFtZSBtZXNzYWdlTmFt ZSwKICAgICByZXR1cm4gZW5jb2RlcjsKIH0KIAotYm9vbCBDb25uZWN0aW9uOjpzZW5kTWVzc2Fn ZShVbmlxdWVSZWY8RW5jb2Rlcj4mJiBlbmNvZGVyLCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2Vu ZE9wdGlvbnMpCitib29sIENvbm5lY3Rpb246OnNlbmRNZXNzYWdlKFVuaXF1ZVJlZjxFbmNvZGVy PiYmIGVuY29kZXIsIE9wdGlvblNldDxTZW5kT3B0aW9uPiBzZW5kT3B0aW9ucywgc3RkOjpvcHRp b25hbDxUaHJlYWQ6OlFPUz4gcW9zKQogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC00OTMsOSArNDkzLDE1IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE1l c3NhZ2UoVW5pcXVlUmVmPEVuY29kZXI+JiYgZW5jb2RlciwgT3B0aW9uU2V0PFNlbmRPcHRpb24+ CiAgICAgfQogICAgIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYWRkIGEgYm9vbGVhbiBmbGFn IHNvIHdlIGRvbid0IGNhbGwgdGhpcyB3aGVuIHdvcmsgaGFzIGFscmVhZHkgYmVlbiBzY2hlZHVs ZWQuCi0gICAgbV9jb25uZWN0aW9uUXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gUmVm IHsgKnRoaXMgfV0oKSBtdXRhYmxlIHsKKyAgICBhdXRvIHNlbmRPdXRnb2luZ01lc3NhZ2VzID0g W3Byb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9XSgpIG11dGFibGUgewogICAgICAgICBwcm90 ZWN0ZWRUaGlzLT5zZW5kT3V0Z29pbmdNZXNzYWdlcygpOwotICAgIH0pOworICAgIH07CisKKyAg ICBpZiAocW9zKQorICAgICAgICBtX2Nvbm5lY3Rpb25RdWV1ZS0+ZGlzcGF0Y2hXaXRoUU9TKFdU Rk1vdmUoc2VuZE91dGdvaW5nTWVzc2FnZXMpLCAqcW9zKTsKKyAgICBlbHNlCisgICAgICAgIG1f Y29ubmVjdGlvblF1ZXVlLT5kaXNwYXRjaChXVEZNb3ZlKHNlbmRPdXRnb2luZ01lc3NhZ2VzKSk7 CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0 Zm9ybS9JUEMvQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVj dGlvbi5oCmluZGV4IDIyMGU1ZWFiY2M0MDk5NjhlZjdiZmYwMDllYzc2MjgyNWMzZTBjNTUuLjVj N2RlNTM5OWQwNjNmMWIwMmRjMWRmNThjMDg0MzQyNjdiNmJkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKQEAgLTI0OCw4ICsyNDgsOCBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHBvc3RDb25uZWN0aW9uRGlkQ2xvc2VPbkNvbm5lY3Rpb25Xb3JrUXVldWUoKTsKICAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBDPiB1aW50NjRfdCBzZW5kV2l0aEFzeW5j UmVwbHkoVCYmIG1lc3NhZ2UsIEMmJiBjb21wbGV0aW9uSGFuZGxlciwgdWludDY0X3QgZGVzdGlu YXRpb25JRCA9IDAsIE9wdGlvblNldDxTZW5kT3B0aW9uPiA9IHsgfSk7IC8vIFRocmVhZC1zYWZl LgotICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0 X3QgZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9 KTsgLy8gVGhyZWFkLXNhZmUuCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGJvb2wg c2VuZChVbmlxdWVJRCwgVCYmIG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIE9wdGlv blNldDxTZW5kT3B0aW9uPiBzZW5kT3B0aW9ucyA9IHsgfSk7IC8vIFRocmVhZC1zYWZlLgorICAg IHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVz dGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9LCBzdGQ6 Om9wdGlvbmFsPFRocmVhZDo6UU9TPiBxb3MgPSBzdGQ6Om51bGxvcHQpOyAvLyBUaHJlYWQtc2Fm ZS4KKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgYm9vbCBzZW5kKFVuaXF1ZUlELCBU JiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+ IHNlbmRPcHRpb25zID0geyB9LCBzdGQ6Om9wdGlvbmFsPFRocmVhZDo6UU9TPiBxb3MgPSBzdGQ6 Om51bGxvcHQpOyAvLyBUaHJlYWQtc2FmZS4KIAogICAgIC8vIFN5bmMgc2VuZGVycyBzaG91bGQg Y2hlY2sgdGhlIFNlbmRTeW5jUmVzdWx0IGZvciB0cnVlL2ZhbHNlIGluIGNhc2UgdGhleSBuZWVk IHRvIGtub3cgaWYgdGhlIHJlc3VsdCB3YXMgcmVhbGx5IHJlY2VpdmVkLgogICAgIC8vIFN5bmMg c2VuZGVycyBzaG91bGQgaG9sZCBvbiB0byB0aGUgU2VuZFN5bmNSZXN1bHQgaW4gY2FzZSB0aGV5 IHJlZmVyZW5jZSB0aGUgY29udGVudHMgb2YgdGhlIHJlcGx5IHZpYSBEYXRhUmVmZXJlcmVuY2Ug LyBBcnJheVJlZmVyZW5jZS4KQEAgLTI2Nyw5ICsyNjcsOSBAQCBwdWJsaWM6CiAgICAgCiAgICAg Ly8gVGhyZWFkLXNhZmUuCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4KLSAg ICBib29sIHNlbmQoVCYmIG1lc3NhZ2UsIE9iamVjdElkZW50aWZpZXI8VT4gZGVzdGluYXRpb25J RCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9KQorICAgIGJvb2wgc2Vu ZChUJiYgbWVzc2FnZSwgT2JqZWN0SWRlbnRpZmllcjxVPiBkZXN0aW5hdGlvbklELCBPcHRpb25T ZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMgPSB7IH0sIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpR T1M+IHFvcyA9IHN0ZDo6bnVsbG9wdCkKICAgICB7Ci0gICAgICAgIHJldHVybiBzZW5kPFQ+KFdU Rk1vdmUobWVzc2FnZSksIGRlc3RpbmF0aW9uSUQudG9VSW50NjQoKSwgc2VuZE9wdGlvbnMpOwor ICAgICAgICByZXR1cm4gc2VuZDxUPihXVEZNb3ZlKG1lc3NhZ2UpLCBkZXN0aW5hdGlvbklELnRv VUludDY0KCksIHNlbmRPcHRpb25zLCBxb3MpOwogICAgIH0KIAogICAgIC8vIE1haW4gdGhyZWFk IG9ubHkuCkBAIC0yODYsNyArMjg2LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gd2FpdEZv ckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8VD4oZGVzdGluYXRpb25JRC50b1VJbnQ2NCgpLCB0aW1l b3V0LCB3YWl0Rm9yT3B0aW9ucyk7CiAgICAgfQogCi0gICAgYm9vbCBzZW5kTWVzc2FnZShVbmlx dWVSZWY8RW5jb2Rlcj4mJiwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zKTsKKyAg ICBib29sIHNlbmRNZXNzYWdlKFVuaXF1ZVJlZjxFbmNvZGVyPiYmLCBPcHRpb25TZXQ8U2VuZE9w dGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+ID0gc3RkOjpudWxs b3B0KTsKICAgICBVbmlxdWVSZWY8RW5jb2Rlcj4gY3JlYXRlU3luY01lc3NhZ2VFbmNvZGVyKE1l c3NhZ2VOYW1lLCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBTeW5jUmVxdWVzdElEJik7CiAgICAg c3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IHNlbmRTeW5jTWVzc2FnZShTeW5jUmVxdWVzdElELCBV bmlxdWVSZWY8RW5jb2Rlcj4mJiwgVGltZW91dCwgT3B0aW9uU2V0PFNlbmRTeW5jT3B0aW9uPiBz ZW5kU3luY09wdGlvbnMpOwogICAgIGJvb2wgc2VuZFN5bmNSZXBseShVbmlxdWVSZWY8RW5jb2Rl cj4mJik7CkBAIC01MTcsMjQgKzUxNywyNCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlw ZW5hbWUgVD4KLWJvb2wgQ29ubmVjdGlvbjo6c2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVz dGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zKQorYm9vbCBDb25u ZWN0aW9uOjpzZW5kKFQmJiBtZXNzYWdlLCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBPcHRpb25T ZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFv cykKIHsKICAgICBDT01QSUxFX0FTU0VSVCghVDo6aXNTeW5jLCBBc3luY01lc3NhZ2VFeHBlY3Rl ZCk7CiAKICAgICBhdXRvIGVuY29kZXIgPSBtYWtlVW5pcXVlUmVmPEVuY29kZXI+KFQ6Om5hbWUo KSwgZGVzdGluYXRpb25JRCk7CiAgICAgZW5jb2Rlci5nZXQoKSA8PCBtZXNzYWdlLmFyZ3VtZW50 cygpOwogICAgIAotICAgIHJldHVybiBzZW5kTWVzc2FnZShXVEZNb3ZlKGVuY29kZXIpLCBzZW5k T3B0aW9ucyk7CisgICAgcmV0dXJuIHNlbmRNZXNzYWdlKFdURk1vdmUoZW5jb2RlciksIHNlbmRP cHRpb25zLCBxb3MpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgotYm9vbCBDb25uZWN0aW9u OjpzZW5kKFVuaXF1ZUlEIGNvbm5lY3Rpb25JRCwgVCYmIG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3Rp bmF0aW9uSUQsIE9wdGlvblNldDxTZW5kT3B0aW9uPiBzZW5kT3B0aW9ucykKK2Jvb2wgQ29ubmVj dGlvbjo6c2VuZChVbmlxdWVJRCBjb25uZWN0aW9uSUQsIFQmJiBtZXNzYWdlLCB1aW50NjRfdCBk ZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6b3B0 aW9uYWw8VGhyZWFkOjpRT1M+IHFvcykKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgc19jb25uZWN0 aW9uTWFwTG9jayB9OwogICAgIGF1dG8qIGNvbm5lY3Rpb24gPSBjb25uZWN0aW9uTWFwKCkuZ2V0 KGNvbm5lY3Rpb25JRCk7CiAgICAgaWYgKCFjb25uZWN0aW9uKQogICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgcmV0dXJuIGNvbm5lY3Rpb24tPnNlbmQoV1RGTW92ZShtZXNzYWdlKSwgZGVzdGlu YXRpb25JRCwgc2VuZE9wdGlvbnMpOworICAgIHJldHVybiBjb25uZWN0aW9uLT5zZW5kKFdURk1v dmUobWVzc2FnZSksIGRlc3RpbmF0aW9uSUQsIHNlbmRPcHRpb25zLCBxb3MpOwogfQogCiB1aW50 NjRfdCBuZXh0QXN5bmNSZXBseUhhbmRsZXJJRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKaW5kZXggMjEwYjJmNGRhMmQyMWFjZDAxMDc3ZTgyMDhmZGE0YTM0ODc0 M2Y0MS4uMTBlNzQzMGI5NjczMzYxMTMxMGQ3MWM4MjgwNDMxNDAwZGYyOTRkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yOTM3LDEyICsyOTM3LDE2IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpzZW5kV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBl dmVudCkKICAgICBtX3doZWVsRXZlbnRBY3Rpdml0eUh5c3RlcmVzaXMuaW1wdWxzZSgpOwogI2Vu ZGlmCiAKKyAgICBhdXRvKiBjb25uZWN0aW9uID0gbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKTsK KyAgICBpZiAoIWNvbm5lY3Rpb24pCisgICAgICAgIHJldHVybjsKKwogICAgIGF1dG8gcnViYmVy QmFuZGFibGVFZGdlcyA9IHRoaXMtPnJ1YmJlckJhbmRhYmxlRWRnZXMoKTsKICAgICBpZiAoc2hv dWxkVXNlSW1wbGljaXRSdWJiZXJCYW5kQ29udHJvbCgpKSB7CiAgICAgICAgIHJ1YmJlckJhbmRh YmxlRWRnZXMuc2V0TGVmdCghbV9iYWNrRm9yd2FyZExpc3QtPmJhY2tJdGVtKCkpOwogICAgICAg ICBydWJiZXJCYW5kYWJsZUVkZ2VzLnNldFJpZ2h0KCFtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2Fy ZEl0ZW0oKSk7CiAgICAgfQotICAgIHNlbmQoTWVzc2FnZXM6OkV2ZW50RGlzcGF0Y2hlcjo6V2hl ZWxFdmVudChtX3dlYlBhZ2VJRCwgZXZlbnQsIHJ1YmJlckJhbmRhYmxlRWRnZXMpLCAwKTsKKyAg ICBjb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6OldoZWVsRXZlbnQo bV93ZWJQYWdlSUQsIGV2ZW50LCBydWJiZXJCYW5kYWJsZUVkZ2VzKSwgMCwgeyB9LCBUaHJlYWQ6 OlFPUzo6VXNlckludGVyYWN0aXZlKTsKIAogICAgIC8vIE1hbnVhbGx5IHBpbmcgdGhlIHdlYiBw cm9jZXNzIHRvIGNoZWNrIGZvciByZXNwb25zaXZlbmVzcyBzaW5jZSBvdXIgd2hlZWwKICAgICAv LyBldmVudCB3aWxsIGRpc3BhdGNoIHRvIGEgbm9uLW1haW4gdGhyZWFkLCB3aGljaCBhbHdheXMg cmVzcG9uZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlzcGxh eUxpbmsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL0Rpc3BsYXlMaW5rLmNwcApp bmRleCA4ZGE5ZGE0MGVjZTFlYmMxM2ZjYmI5NGI2N2EwMGMwMWYyZmY1ZTlhLi4zODQ4ZmIxYWNl YTZmMWUyZWI3YTI3MjAwYTkyZDc2MjM4ZWVhMTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvRGlzcGxheUxpbmsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9EaXNwbGF5TGluay5jcHAKQEAgLTIzNiw5ICsyMzYsOSBAQCB2b2lkIERpc3BsYXlM aW5rOjpub3RpZnlPYnNlcnZlcnNEaXNwbGF5V2FzUmVmcmVzaGVkKCkKICAgICAgICAgICAgIDw8 ICIgb2JzZXJ2ZXJzLCBvbiBiYWNrZ3JvdW5kIHF1ZXVlICIgPDwgc2hvdWxkU2VuZElQQ09uQmFj a2dyb3VuZFF1ZXVlIDw8ICIgbWF4RnJhbWVzUGVyU2Vjb25kICIgPDwgb2JzZXJ2ZXJzTWF4RnJh bWVzUGVyU2Vjb25kIDw8ICIgZnVsbCBzcGVlZCBjbGllbnRzICIgPDwgY29ubmVjdGlvbkluZm8u ZnVsbFNwZWVkVXBkYXRlc0NsaWVudENvdW50IDw8ICIgcmVsZXZhbnQgIiA8PCBtYWluVGhyZWFk V2FudHNVcGRhdGUpOwogCiAgICAgICAgIGlmIChjb25uZWN0aW9uSW5mby5mdWxsU3BlZWRVcGRh dGVzQ2xpZW50Q291bnQpIHsKLSAgICAgICAgICAgIElQQzo6Q29ubmVjdGlvbjo6c2VuZChjb25u ZWN0aW9uSUQsIE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6OkRpc3BsYXlXYXNSZWZyZXNoZWQo bV9kaXNwbGF5SUQsIG1fY3VycmVudFVwZGF0ZSwgbWFpblRocmVhZFdhbnRzVXBkYXRlKSwgMCk7 CisgICAgICAgICAgICBJUEM6OkNvbm5lY3Rpb246OnNlbmQoY29ubmVjdGlvbklELCBNZXNzYWdl czo6RXZlbnREaXNwYXRjaGVyOjpEaXNwbGF5V2FzUmVmcmVzaGVkKG1fZGlzcGxheUlELCBtX2N1 cnJlbnRVcGRhdGUsIG1haW5UaHJlYWRXYW50c1VwZGF0ZSksIDAsIHsgfSwgVGhyZWFkOjpRT1M6 OlVzZXJJbnRlcmFjdGl2ZSk7CiAgICAgICAgIH0gZWxzZSBpZiAobWFpblRocmVhZFdhbnRzVXBk YXRlKQotICAgICAgICAgICAgSVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb25JRCwgTWVz c2FnZXM6OldlYlByb2Nlc3M6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3Vy cmVudFVwZGF0ZSksIDApOworICAgICAgICAgICAgSVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5l Y3Rpb25JRCwgTWVzc2FnZXM6OldlYlByb2Nlc3M6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNw bGF5SUQsIG1fY3VycmVudFVwZGF0ZSksIDAsIHsgfSwgVGhyZWFkOjpRT1M6OlVzZXJJbnRlcmFj dGl2ZSk7CiAgICAgfQogCiAgICAgbV9jdXJyZW50VXBkYXRlID0gbV9jdXJyZW50VXBkYXRlLm5l eHRVcGRhdGUoKTsK 442850 2021-10-29 12:42:51 -0700 2021-10-29 14:59:49 -0700 Patch bug-232458-20211029124251.patch text/plain 12534 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgzNzZlMDk3YTBhNTI4MjkzMDYyNmMw MWJmMDA5NmYzNDFjZTA1NWUuLjVmNWY5YjQ4NzVlNzk1ZDFhYTQ4MGViNTYzOGUwODRlMzdjYWQ3 M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMTAtMjkgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaGlnaGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQg RGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI0NTgKKyAgICAgICAgPHJkYXI6Ly84MjY1Nzc0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZGlzcGF0Y2hX aXRoUU9TKCkgZnVuY3Rpb24gdG8gV29ya1F1ZXVlIHRvIGRpc3BhdGNoIGEgdGFzayB3aXRoIGEg Z2l2ZW4gUW9TLgorCisgICAgICAgICogd3RmL1dvcmtRdWV1ZS5jcHA6CisgICAgICAgIChXVEY6 OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisgICAgICAgICogd3RmL1dvcmtRdWV1 ZS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9Xb3JrUXVldWVDb2NvYS5jcHA6CisgICAgICAgIChX VEY6OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisKIDIwMjEtMTAtMjkgIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBjb25zdGFudHMgZm9y IGFsbCBzcGVjaWFsIGZyYW1lIG5hbWVzIHVzZWQgaW4gYW5jaG9yIHRhcmdldCBhdHRyaWJ1dGUg dmFsdWVzIGFuZCBlbHNld2hlcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZWViMmRiNGY1NmRkMzcxMmRiZTg5OWEx NWE0M2RmNmJmZGJhY2M5OS4uZTA5YTNkOTVhZGFlNmVjNzBlNjkyMmYwY2JjNjlhNDhiMTk2YTI3 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAyMS0xMC0yOSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBoaWdoZXIgUW9TIGZvciBXaGVlbEV2ZW50 IGFuZCBEaXNwbGF5V2FzUmVmcmVzaGVkIElQQ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OAorICAgICAgICA8cmRhcjovLzgyNjU3NzQ0Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBoaWdo ZXIgUW9TIGZvciBXaGVlbEV2ZW50IGFuZCBEaXNwbGF5V2FzUmVmcmVzaGVkIElQQ3Mgc2luY2Ug dGhvc2UgYXJlIGhpZ2ggcHJpb3JpdHkuIFRoZQorICAgICAgICBVSVByb2Nlc3MncyBtYWluIHRo cmVhZCBoYXMgaGlnaCBVc2VySW50ZXJhY3RpdmUgUW9TIGJ1dCB0aGUgSVBDIHRocmVhZCBoYXMg YSBsb3dlciBRb1MgYnkgZGVmYXVsdC4KKworICAgICAgICBXZSBjYW5ub3QgcmFpc2UgdGhlIFFv UyBvZiB0aGUgSVBDIHRocmVhZCB3aXRob3V0IHJlZ3Jlc3Npbmcgc29tZSBwZXJmb3JtYW5jZSBi ZW5jaG1hcmtzIHNpbmNlIG5vdAorICAgICAgICBhbGwgSVBDIGlzIGhpZ2ggcHJpb3JpdHkuCisK KyAgICAgICAgTWFraW5nIHRoaXMgY2hhbmdlIGhlbHBzIHdpdGggcmVzcG9uc2l2ZW5lc3MgdW5k ZXIgaGVhdnkgbG9hZCBzY2VuYXJpb3MuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVj dGlvbi5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnNlbmRNZXNzYWdlKToKKyAgICAg ICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9u OjpzZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZW5kV2hlZWxFdmVudCk6CisgICAgICAgICogVUlQcm9j ZXNzL21hYy9EaXNwbGF5TGluay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjpu b3RpZnlPYnNlcnZlcnNEaXNwbGF5V2FzUmVmcmVzaGVkKToKKwogMjAyMS0xMC0yOSAgU2lodWkg TGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWxlYXNlIEZpbGVTeXN0ZW1T dG9yYWdlSGFuZGxlIHdoZW4gaXQgaXMgbm90IGluIHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvV29ya1F1ZXVlLmNwcCBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5jcHAKaW5kZXgg MjhlOWE3YTkzYjNjMmE5MTNiZTcwMzBkMDBmODAxZWRiMzg0ODA1YS4uOWUxMDZlMzk0ZDNmNDRk MmMyNWZjM2NhMTUzNTQwZTUyMDRjYjM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvV29y a1F1ZXVlLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuY3BwCkBAIC04MSw2ICs4 MSwxMSBAQCB2b2lkIFdvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoU3luYyhGdW5jdGlvbjx2b2lkKCk+ JiYgZnVuY3Rpb24pCiAgICAgc2VtYXBob3JlLndhaXQoKTsKIH0KIAordm9pZCBXb3JrUXVldWVC YXNlOjpkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBRT1MpCit7 CisgICAgZGlzcGF0Y2goV1RGTW92ZShmdW5jdGlvbikpOworfQorCiB2b2lkIENvbmN1cnJlbnRX b3JrUXVldWU6OmFwcGx5KHNpemVfdCBpdGVyYXRpb25zLCBXVEY6OkZ1bmN0aW9uPHZvaWQoc2l6 ZV90IGluZGV4KT4mJiBmdW5jdGlvbikKIHsKICAgICBpZiAoIWl0ZXJhdGlvbnMpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuaCBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1 ZS5oCmluZGV4IDk4Y2UzY2I4MWE3Y2E0YzViMjQwNGQxZTIwM2RkZWE3OTJiY2VlNjEuLjM2OGMw NjZkOGY5NmI0YmNlNzQzMTgyNTJlM2MwMjY2NjFkOGY2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X VEYvd3RmL1dvcmtRdWV1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCkBAIC00 OCw2ICs0OCw3IEBAIHB1YmxpYzoKICAgICB+V29ya1F1ZXVlQmFzZSgpIG92ZXJyaWRlOwogCiAg ICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGlzcGF0Y2goRnVuY3Rpb248dm9pZCgpPiYmKSBv dmVycmlkZTsKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkaXNwYXRjaFdpdGhRT1MoRnVu Y3Rpb248dm9pZCgpPiYmLCBRT1MpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZv aWQgZGlzcGF0Y2hBZnRlcihTZWNvbmRzLCBGdW5jdGlvbjx2b2lkKCk+JiYpOwogICAgIFdURl9F WFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hTeW5jKEZ1bmN0aW9uPHZvaWQoKT4m Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1dvcmtRdWV1ZUNvY29hLmNw cCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1dvcmtRdWV1ZUNvY29hLmNwcAppbmRleCBiMDg1YWY3 OGZkNTk1NGYzNmNkNzgwOGQ2MjAwZDJmOTgwY2JiOTcyLi5mOWY0N2YxMWM3ODQ1ZDI3NWUxMWNm NzIwZDBhODU2MjU5Y2IyMjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9Xb3Jr UXVldWVDb2NvYS5jcHAKKysrIGIvU291cmNlL1dURi93dGYvY29jb2EvV29ya1F1ZXVlQ29jb2Eu Y3BwCkBAIC01NCw2ICs1NCwxNyBAQCB2b2lkIFdvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoKEZ1bmN0 aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKICAgICBkaXNwYXRjaF9hc3luY19mKG1fZGlzcGF0Y2hR dWV1ZS5nZXQoKSwgbmV3IERpc3BhdGNoV29ya0l0ZW0geyBSZWYgeyAqdGhpcyB9LCBXVEZNb3Zl KGZ1bmN0aW9uKSB9LCBkaXNwYXRjaFdvcmtJdGVtPERpc3BhdGNoV29ya0l0ZW0+KTsKIH0KIAor dm9pZCBXb3JrUXVldWVCYXNlOjpkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmIGZ1 bmN0aW9uLCBRT1MgcW9zKQoreworICAgIGRpc3BhdGNoX2Jsb2NrX3QgYmxvY2tXaXRoUU9TID0g ZGlzcGF0Y2hfYmxvY2tfY3JlYXRlX3dpdGhfcW9zX2NsYXNzKERJU1BBVENIX0JMT0NLX0VORk9S Q0VfUU9TX0NMQVNTLCBUaHJlYWQ6OmRpc3BhdGNoUU9TQ2xhc3MocW9zKSwgMCwgbWFrZUJsb2Nr UHRyKFtmdW5jdGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pXSB7CisgICAgICAgIGZ1bmN0aW9uKCk7 CisgICAgfSkuZ2V0KCkpOworICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQo KSwgYmxvY2tXaXRoUU9TKTsKKyNpZiAhX19oYXNfZmVhdHVyZShvYmpjX2FyYykKKyAgICBCbG9j a19yZWxlYXNlKGJsb2NrV2l0aFFPUyk7CisjZW5kaWYKK30KKwogdm9pZCBXb3JrUXVldWVCYXNl OjpkaXNwYXRjaEFmdGVyKFNlY29uZHMgZHVyYXRpb24sIEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5j dGlvbikKIHsKICAgICBkaXNwYXRjaF9hZnRlcl9mKGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElN RV9OT1csIGR1cmF0aW9uLm5hbm9zZWNvbmRzQXM8aW50NjRfdD4oKSksIG1fZGlzcGF0Y2hRdWV1 ZS5nZXQoKSwgbmV3IERpc3BhdGNoV29ya0l0ZW0geyBSZWYgeyAqdGhpcyB9LCAgV1RGTW92ZShm dW5jdGlvbikgfSwgZGlzcGF0Y2hXb3JrSXRlbTxEaXNwYXRjaFdvcmtJdGVtPik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCmluZGV4IGI4YTNlYTY1M2Y0ODRiNDY0 MGQzMjM0YzllZDNhN2Y2ODU0MDA2ZTguLmQzNGE0NDJhMzZlNDkwYjNkYWFiZTZiNzQyZjAyZDA0 YmRiYzRlNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCkBA IC00NTMsNyArNDUzLDcgQEAgVW5pcXVlUmVmPEVuY29kZXI+IENvbm5lY3Rpb246OmNyZWF0ZVN5 bmNNZXNzYWdlRW5jb2RlcihNZXNzYWdlTmFtZSBtZXNzYWdlTmFtZSwKICAgICByZXR1cm4gZW5j b2RlcjsKIH0KIAotYm9vbCBDb25uZWN0aW9uOjpzZW5kTWVzc2FnZShVbmlxdWVSZWY8RW5jb2Rl cj4mJiBlbmNvZGVyLCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMpCitib29sIENv bm5lY3Rpb246OnNlbmRNZXNzYWdlKFVuaXF1ZVJlZjxFbmNvZGVyPiYmIGVuY29kZXIsIE9wdGlv blNldDxTZW5kT3B0aW9uPiBzZW5kT3B0aW9ucywgc3RkOjpvcHRpb25hbDxUaHJlYWQ6OlFPUz4g cW9zKQogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00 OTMsOSArNDkzLDE1IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UoVW5pcXVlUmVmPEVu Y29kZXI+JiYgZW5jb2RlciwgT3B0aW9uU2V0PFNlbmRPcHRpb24+CiAgICAgfQogICAgIAogICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgYWRkIGEgYm9vbGVhbiBmbGFnIHNvIHdlIGRvbid0IGNhbGwg dGhpcyB3aGVuIHdvcmsgaGFzIGFscmVhZHkgYmVlbiBzY2hlZHVsZWQuCi0gICAgbV9jb25uZWN0 aW9uUXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfV0oKSBtdXRh YmxlIHsKKyAgICBhdXRvIHNlbmRPdXRnb2luZ01lc3NhZ2VzID0gW3Byb3RlY3RlZFRoaXMgPSBS ZWYgeyAqdGhpcyB9XSgpIG11dGFibGUgewogICAgICAgICBwcm90ZWN0ZWRUaGlzLT5zZW5kT3V0 Z29pbmdNZXNzYWdlcygpOwotICAgIH0pOworICAgIH07CisKKyAgICBpZiAocW9zKQorICAgICAg ICBtX2Nvbm5lY3Rpb25RdWV1ZS0+ZGlzcGF0Y2hXaXRoUU9TKFdURk1vdmUoc2VuZE91dGdvaW5n TWVzc2FnZXMpLCAqcW9zKTsKKyAgICBlbHNlCisgICAgICAgIG1fY29ubmVjdGlvblF1ZXVlLT5k aXNwYXRjaChXVEZNb3ZlKHNlbmRPdXRnb2luZ01lc3NhZ2VzKSk7CisKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlv bi5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCmluZGV4IDIyMGU1 ZWFiY2M0MDk5NjhlZjdiZmYwMDllYzc2MjgyNWMzZTBjNTUuLjVjN2RlNTM5OWQwNjNmMWIwMmRj MWRmNThjMDg0MzQyNjdiNmJkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v SVBDL0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0 aW9uLmgKQEAgLTI0OCw4ICsyNDgsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHBvc3RDb25uZWN0 aW9uRGlkQ2xvc2VPbkNvbm5lY3Rpb25Xb3JrUXVldWUoKTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBULCB0eXBlbmFtZSBDPiB1aW50NjRfdCBzZW5kV2l0aEFzeW5jUmVwbHkoVCYmIG1lc3NhZ2Us IEMmJiBjb21wbGV0aW9uSGFuZGxlciwgdWludDY0X3QgZGVzdGluYXRpb25JRCA9IDAsIE9wdGlv blNldDxTZW5kT3B0aW9uPiA9IHsgfSk7IC8vIFRocmVhZC1zYWZlLgotICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwg T3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9KTsgLy8gVGhyZWFkLXNhZmUu Ci0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGJvb2wgc2VuZChVbmlxdWVJRCwgVCYm IG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIE9wdGlvblNldDxTZW5kT3B0aW9uPiBz ZW5kT3B0aW9ucyA9IHsgfSk7IC8vIFRocmVhZC1zYWZlLgorICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQ+IGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9u U2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9LCBzdGQ6Om9wdGlvbmFsPFRocmVhZDo6 UU9TPiBxb3MgPSBzdGQ6Om51bGxvcHQpOyAvLyBUaHJlYWQtc2FmZS4KKyAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBzdGF0aWMgYm9vbCBzZW5kKFVuaXF1ZUlELCBUJiYgbWVzc2FnZSwgdWludDY0 X3QgZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9 LCBzdGQ6Om9wdGlvbmFsPFRocmVhZDo6UU9TPiBxb3MgPSBzdGQ6Om51bGxvcHQpOyAvLyBUaHJl YWQtc2FmZS4KIAogICAgIC8vIFN5bmMgc2VuZGVycyBzaG91bGQgY2hlY2sgdGhlIFNlbmRTeW5j UmVzdWx0IGZvciB0cnVlL2ZhbHNlIGluIGNhc2UgdGhleSBuZWVkIHRvIGtub3cgaWYgdGhlIHJl c3VsdCB3YXMgcmVhbGx5IHJlY2VpdmVkLgogICAgIC8vIFN5bmMgc2VuZGVycyBzaG91bGQgaG9s ZCBvbiB0byB0aGUgU2VuZFN5bmNSZXN1bHQgaW4gY2FzZSB0aGV5IHJlZmVyZW5jZSB0aGUgY29u dGVudHMgb2YgdGhlIHJlcGx5IHZpYSBEYXRhUmVmZXJlcmVuY2UgLyBBcnJheVJlZmVyZW5jZS4K QEAgLTI2Nyw5ICsyNjcsOSBAQCBwdWJsaWM6CiAgICAgCiAgICAgLy8gVGhyZWFkLXNhZmUuCiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4KLSAgICBib29sIHNlbmQoVCYmIG1l c3NhZ2UsIE9iamVjdElkZW50aWZpZXI8VT4gZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRP cHRpb24+IHNlbmRPcHRpb25zID0geyB9KQorICAgIGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgT2Jq ZWN0SWRlbnRpZmllcjxVPiBkZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2Vu ZE9wdGlvbnMgPSB7IH0sIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFvcyA9IHN0ZDo6bnVs bG9wdCkKICAgICB7Ci0gICAgICAgIHJldHVybiBzZW5kPFQ+KFdURk1vdmUobWVzc2FnZSksIGRl c3RpbmF0aW9uSUQudG9VSW50NjQoKSwgc2VuZE9wdGlvbnMpOworICAgICAgICByZXR1cm4gc2Vu ZDxUPihXVEZNb3ZlKG1lc3NhZ2UpLCBkZXN0aW5hdGlvbklELnRvVUludDY0KCksIHNlbmRPcHRp b25zLCBxb3MpOwogICAgIH0KIAogICAgIC8vIE1haW4gdGhyZWFkIG9ubHkuCkBAIC0yODYsNyAr Mjg2LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gd2FpdEZvckFuZERpc3BhdGNoSW1tZWRp YXRlbHk8VD4oZGVzdGluYXRpb25JRC50b1VJbnQ2NCgpLCB0aW1lb3V0LCB3YWl0Rm9yT3B0aW9u cyk7CiAgICAgfQogCi0gICAgYm9vbCBzZW5kTWVzc2FnZShVbmlxdWVSZWY8RW5jb2Rlcj4mJiwg T3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zKTsKKyAgICBib29sIHNlbmRNZXNzYWdl KFVuaXF1ZVJlZjxFbmNvZGVyPiYmLCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMs IHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+ID0gc3RkOjpudWxsb3B0KTsKICAgICBVbmlxdWVS ZWY8RW5jb2Rlcj4gY3JlYXRlU3luY01lc3NhZ2VFbmNvZGVyKE1lc3NhZ2VOYW1lLCB1aW50NjRf dCBkZXN0aW5hdGlvbklELCBTeW5jUmVxdWVzdElEJik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPERl Y29kZXI+IHNlbmRTeW5jTWVzc2FnZShTeW5jUmVxdWVzdElELCBVbmlxdWVSZWY8RW5jb2Rlcj4m JiwgVGltZW91dCwgT3B0aW9uU2V0PFNlbmRTeW5jT3B0aW9uPiBzZW5kU3luY09wdGlvbnMpOwog ICAgIGJvb2wgc2VuZFN5bmNSZXBseShVbmlxdWVSZWY8RW5jb2Rlcj4mJik7CkBAIC01MTcsMjQg KzUxNywyNCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KLWJvb2wgQ29u bmVjdGlvbjo6c2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9u U2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zKQorYm9vbCBDb25uZWN0aW9uOjpzZW5kKFQmJiBt ZXNzYWdlLCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2Vu ZE9wdGlvbnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFvcykKIHsKICAgICBDT01QSUxF X0FTU0VSVCghVDo6aXNTeW5jLCBBc3luY01lc3NhZ2VFeHBlY3RlZCk7CiAKICAgICBhdXRvIGVu Y29kZXIgPSBtYWtlVW5pcXVlUmVmPEVuY29kZXI+KFQ6Om5hbWUoKSwgZGVzdGluYXRpb25JRCk7 CiAgICAgZW5jb2Rlci5nZXQoKSA8PCBtZXNzYWdlLmFyZ3VtZW50cygpOwogICAgIAotICAgIHJl dHVybiBzZW5kTWVzc2FnZShXVEZNb3ZlKGVuY29kZXIpLCBzZW5kT3B0aW9ucyk7CisgICAgcmV0 dXJuIHNlbmRNZXNzYWdlKFdURk1vdmUoZW5jb2RlciksIHNlbmRPcHRpb25zLCBxb3MpOwogfQog CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgotYm9vbCBDb25uZWN0aW9uOjpzZW5kKFVuaXF1ZUlEIGNv bm5lY3Rpb25JRCwgVCYmIG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIE9wdGlvblNl dDxTZW5kT3B0aW9uPiBzZW5kT3B0aW9ucykKK2Jvb2wgQ29ubmVjdGlvbjo6c2VuZChVbmlxdWVJ RCBjb25uZWN0aW9uSUQsIFQmJiBtZXNzYWdlLCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBPcHRp b25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+ IHFvcykKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgc19jb25uZWN0aW9uTWFwTG9jayB9OwogICAg IGF1dG8qIGNvbm5lY3Rpb24gPSBjb25uZWN0aW9uTWFwKCkuZ2V0KGNvbm5lY3Rpb25JRCk7CiAg ICAgaWYgKCFjb25uZWN0aW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIGNv bm5lY3Rpb24tPnNlbmQoV1RGTW92ZShtZXNzYWdlKSwgZGVzdGluYXRpb25JRCwgc2VuZE9wdGlv bnMpOworICAgIHJldHVybiBjb25uZWN0aW9uLT5zZW5kKFdURk1vdmUobWVzc2FnZSksIGRlc3Rp bmF0aW9uSUQsIHNlbmRPcHRpb25zLCBxb3MpOwogfQogCiB1aW50NjRfdCBuZXh0QXN5bmNSZXBs eUhhbmRsZXJJRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5k ZXggMjEwYjJmNGRhMmQyMWFjZDAxMDc3ZTgyMDhmZGE0YTM0ODc0M2Y0MS4uMTBlNzQzMGI5Njcz MzYxMTMxMGQ3MWM4MjgwNDMxNDAwZGYyOTRkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCkBAIC0yOTM3LDEyICsyOTM3LDE2IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpzZW5kV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBldmVudCkKICAgICBtX3doZWVs RXZlbnRBY3Rpdml0eUh5c3RlcmVzaXMuaW1wdWxzZSgpOwogI2VuZGlmCiAKKyAgICBhdXRvKiBj b25uZWN0aW9uID0gbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKTsKKyAgICBpZiAoIWNvbm5lY3Rp b24pCisgICAgICAgIHJldHVybjsKKwogICAgIGF1dG8gcnViYmVyQmFuZGFibGVFZGdlcyA9IHRo aXMtPnJ1YmJlckJhbmRhYmxlRWRnZXMoKTsKICAgICBpZiAoc2hvdWxkVXNlSW1wbGljaXRSdWJi ZXJCYW5kQ29udHJvbCgpKSB7CiAgICAgICAgIHJ1YmJlckJhbmRhYmxlRWRnZXMuc2V0TGVmdCgh bV9iYWNrRm9yd2FyZExpc3QtPmJhY2tJdGVtKCkpOwogICAgICAgICBydWJiZXJCYW5kYWJsZUVk Z2VzLnNldFJpZ2h0KCFtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2FyZEl0ZW0oKSk7CiAgICAgfQot ICAgIHNlbmQoTWVzc2FnZXM6OkV2ZW50RGlzcGF0Y2hlcjo6V2hlZWxFdmVudChtX3dlYlBhZ2VJ RCwgZXZlbnQsIHJ1YmJlckJhbmRhYmxlRWRnZXMpLCAwKTsKKyAgICBjb25uZWN0aW9uLT5zZW5k KE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6OldoZWVsRXZlbnQobV93ZWJQYWdlSUQsIGV2ZW50 LCBydWJiZXJCYW5kYWJsZUVkZ2VzKSwgMCwgeyB9LCBUaHJlYWQ6OlFPUzo6VXNlckludGVyYWN0 aXZlKTsKIAogICAgIC8vIE1hbnVhbGx5IHBpbmcgdGhlIHdlYiBwcm9jZXNzIHRvIGNoZWNrIGZv ciByZXNwb25zaXZlbmVzcyBzaW5jZSBvdXIgd2hlZWwKICAgICAvLyBldmVudCB3aWxsIGRpc3Bh dGNoIHRvIGEgbm9uLW1haW4gdGhyZWFkLCB3aGljaCBhbHdheXMgcmVzcG9uZHMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlzcGxheUxpbmsuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL0Rpc3BsYXlMaW5rLmNwcAppbmRleCA4ZGE5ZGE0MGVjZTFl YmMxM2ZjYmI5NGI2N2EwMGMwMWYyZmY1ZTlhLi4zODQ4ZmIxYWNlYTZmMWUyZWI3YTI3MjAwYTky ZDc2MjM4ZWVhMTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlz cGxheUxpbmsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9EaXNwbGF5TGlu ay5jcHAKQEAgLTIzNiw5ICsyMzYsOSBAQCB2b2lkIERpc3BsYXlMaW5rOjpub3RpZnlPYnNlcnZl cnNEaXNwbGF5V2FzUmVmcmVzaGVkKCkKICAgICAgICAgICAgIDw8ICIgb2JzZXJ2ZXJzLCBvbiBi YWNrZ3JvdW5kIHF1ZXVlICIgPDwgc2hvdWxkU2VuZElQQ09uQmFja2dyb3VuZFF1ZXVlIDw8ICIg bWF4RnJhbWVzUGVyU2Vjb25kICIgPDwgb2JzZXJ2ZXJzTWF4RnJhbWVzUGVyU2Vjb25kIDw8ICIg ZnVsbCBzcGVlZCBjbGllbnRzICIgPDwgY29ubmVjdGlvbkluZm8uZnVsbFNwZWVkVXBkYXRlc0Ns aWVudENvdW50IDw8ICIgcmVsZXZhbnQgIiA8PCBtYWluVGhyZWFkV2FudHNVcGRhdGUpOwogCiAg ICAgICAgIGlmIChjb25uZWN0aW9uSW5mby5mdWxsU3BlZWRVcGRhdGVzQ2xpZW50Q291bnQpIHsK LSAgICAgICAgICAgIElQQzo6Q29ubmVjdGlvbjo6c2VuZChjb25uZWN0aW9uSUQsIE1lc3NhZ2Vz OjpFdmVudERpc3BhdGNoZXI6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3Vy cmVudFVwZGF0ZSwgbWFpblRocmVhZFdhbnRzVXBkYXRlKSwgMCk7CisgICAgICAgICAgICBJUEM6 OkNvbm5lY3Rpb246OnNlbmQoY29ubmVjdGlvbklELCBNZXNzYWdlczo6RXZlbnREaXNwYXRjaGVy OjpEaXNwbGF5V2FzUmVmcmVzaGVkKG1fZGlzcGxheUlELCBtX2N1cnJlbnRVcGRhdGUsIG1haW5U aHJlYWRXYW50c1VwZGF0ZSksIDAsIHsgfSwgVGhyZWFkOjpRT1M6OlVzZXJJbnRlcmFjdGl2ZSk7 CiAgICAgICAgIH0gZWxzZSBpZiAobWFpblRocmVhZFdhbnRzVXBkYXRlKQotICAgICAgICAgICAg SVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb25JRCwgTWVzc2FnZXM6OldlYlByb2Nlc3M6 OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3VycmVudFVwZGF0ZSksIDApOwor ICAgICAgICAgICAgSVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb25JRCwgTWVzc2FnZXM6 OldlYlByb2Nlc3M6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3VycmVudFVw ZGF0ZSksIDAsIHsgfSwgVGhyZWFkOjpRT1M6OlVzZXJJbnRlcmFjdGl2ZSk7CiAgICAgfQogCiAg ICAgbV9jdXJyZW50VXBkYXRlID0gbV9jdXJyZW50VXBkYXRlLm5leHRVcGRhdGUoKTsK 442867 2021-10-29 14:59:52 -0700 2021-11-02 08:43:08 -0700 Patch bug-232458-20211029145951.patch text/plain 12585 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGU1ZTI3ZWExNGM1OTIxYTcxZGRkZmRk OTViNmIzYTQwYjI0ZjJjMjkuLmY5ZDdmMDEyZjcwODhlMjI5ZmRjNDM3OGMwY2FiZDU2MWM3NWUy YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMTAtMjkgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaGlnaGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQg RGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI0NTgKKyAgICAgICAgPHJkYXI6Ly84MjY1Nzc0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZGlzcGF0Y2hX aXRoUU9TKCkgZnVuY3Rpb24gdG8gV29ya1F1ZXVlIHRvIGRpc3BhdGNoIGEgdGFzayB3aXRoIGEg Z2l2ZW4gUW9TLgorCisgICAgICAgICogd3RmL1dvcmtRdWV1ZS5jcHA6CisgICAgICAgIChXVEY6 OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisgICAgICAgICogd3RmL1dvcmtRdWV1 ZS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9Xb3JrUXVldWVDb2NvYS5jcHA6CisgICAgICAgIChX VEY6OldvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoV2l0aFFPUyk6CisKIDIwMjEtMTAtMjkgIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBjb25zdGFudHMgZm9y IGFsbCBzcGVjaWFsIGZyYW1lIG5hbWVzIHVzZWQgaW4gYW5jaG9yIHRhcmdldCBhdHRyaWJ1dGUg dmFsdWVzIGFuZCBlbHNld2hlcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYjM0ZWYwMTFlNzI4ZjJjMWMyYzFlNzA1 YTZiYmRiMzQ1MjlkNjlkYi4uYjBiZGRjNWE1OWEyOTZmMjRhMDFkYWQ4ZThjMGQyNjBjOTgzNjI5 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAyMS0xMC0yOSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBoaWdoZXIgUW9TIGZvciBXaGVlbEV2ZW50 IGFuZCBEaXNwbGF5V2FzUmVmcmVzaGVkIElQQ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OAorICAgICAgICA8cmRhcjovLzgyNjU3NzQ0Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBoaWdo ZXIgUW9TIGZvciBXaGVlbEV2ZW50IGFuZCBEaXNwbGF5V2FzUmVmcmVzaGVkIElQQ3Mgc2luY2Ug dGhvc2UgYXJlIGhpZ2ggcHJpb3JpdHkuIFRoZQorICAgICAgICBVSVByb2Nlc3MncyBtYWluIHRo cmVhZCBoYXMgaGlnaCBVc2VySW50ZXJhY3RpdmUgUW9TIGJ1dCB0aGUgSVBDIHRocmVhZCBoYXMg YSBsb3dlciBRb1MgYnkgZGVmYXVsdC4KKworICAgICAgICBXZSBjYW5ub3QgcmFpc2UgdGhlIFFv UyBvZiB0aGUgSVBDIHRocmVhZCB3aXRob3V0IHJlZ3Jlc3Npbmcgc29tZSBwZXJmb3JtYW5jZSBi ZW5jaG1hcmtzIHNpbmNlIG5vdAorICAgICAgICBhbGwgSVBDIGlzIGhpZ2ggcHJpb3JpdHkuCisK KyAgICAgICAgTWFraW5nIHRoaXMgY2hhbmdlIGhlbHBzIHdpdGggcmVzcG9uc2l2ZW5lc3MgdW5k ZXIgaGVhdnkgbG9hZCBzY2VuYXJpb3MuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVj dGlvbi5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnNlbmRNZXNzYWdlKToKKyAgICAg ICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9u OjpzZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZW5kV2hlZWxFdmVudCk6CisgICAgICAgICogVUlQcm9j ZXNzL21hYy9EaXNwbGF5TGluay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjpu b3RpZnlPYnNlcnZlcnNEaXNwbGF5V2FzUmVmcmVzaGVkKToKKwogMjAyMS0xMC0yOSAgSm9obiBQ YXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGxhc3QgbW9kaWZpZWQg YW5kIGNyZWF0aW9uIHRpbWUgdG8gK1tfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIGdldEFsbExv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv V29ya1F1ZXVlLmNwcCBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5jcHAKaW5kZXggMjhlOWE3 YTkzYjNjMmE5MTNiZTcwMzBkMDBmODAxZWRiMzg0ODA1YS4uOWUxMDZlMzk0ZDNmNDRkMmMyNWZj M2NhMTUzNTQwZTUyMDRjYjM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvV29ya1F1ZXVl LmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuY3BwCkBAIC04MSw2ICs4MSwxMSBA QCB2b2lkIFdvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoU3luYyhGdW5jdGlvbjx2b2lkKCk+JiYgZnVu Y3Rpb24pCiAgICAgc2VtYXBob3JlLndhaXQoKTsKIH0KIAordm9pZCBXb3JrUXVldWVCYXNlOjpk aXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBRT1MpCit7CisgICAg ZGlzcGF0Y2goV1RGTW92ZShmdW5jdGlvbikpOworfQorCiB2b2lkIENvbmN1cnJlbnRXb3JrUXVl dWU6OmFwcGx5KHNpemVfdCBpdGVyYXRpb25zLCBXVEY6OkZ1bmN0aW9uPHZvaWQoc2l6ZV90IGlu ZGV4KT4mJiBmdW5jdGlvbikKIHsKICAgICBpZiAoIWl0ZXJhdGlvbnMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuaCBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCmlu ZGV4IDk4Y2UzY2I4MWE3Y2E0YzViMjQwNGQxZTIwM2RkZWE3OTJiY2VlNjEuLjM2OGMwNjZkOGY5 NmI0YmNlNzQzMTgyNTJlM2MwMjY2NjFkOGY2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L1dvcmtRdWV1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1dvcmtRdWV1ZS5oCkBAIC00OCw2ICs0 OCw3IEBAIHB1YmxpYzoKICAgICB+V29ya1F1ZXVlQmFzZSgpIG92ZXJyaWRlOwogCiAgICAgV1RG X0VYUE9SVF9QUklWQVRFIHZvaWQgZGlzcGF0Y2goRnVuY3Rpb248dm9pZCgpPiYmKSBvdmVycmlk ZTsKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248 dm9pZCgpPiYmLCBRT1MpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgZGlz cGF0Y2hBZnRlcihTZWNvbmRzLCBGdW5jdGlvbjx2b2lkKCk+JiYpOwogICAgIFdURl9FWFBPUlRf UFJJVkFURSB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hTeW5jKEZ1bmN0aW9uPHZvaWQoKT4mJik7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1dvcmtRdWV1ZUNvY29hLmNwcCBiL1Nv dXJjZS9XVEYvd3RmL2NvY29hL1dvcmtRdWV1ZUNvY29hLmNwcAppbmRleCBiMDg1YWY3OGZkNTk1 NGYzNmNkNzgwOGQ2MjAwZDJmOTgwY2JiOTcyLi5mOWY0N2YxMWM3ODQ1ZDI3NWUxMWNmNzIwZDBh ODU2MjU5Y2IyMjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9Xb3JrUXVldWVD b2NvYS5jcHAKKysrIGIvU291cmNlL1dURi93dGYvY29jb2EvV29ya1F1ZXVlQ29jb2EuY3BwCkBA IC01NCw2ICs1NCwxNyBAQCB2b2lkIFdvcmtRdWV1ZUJhc2U6OmRpc3BhdGNoKEZ1bmN0aW9uPHZv aWQoKT4mJiBmdW5jdGlvbikKICAgICBkaXNwYXRjaF9hc3luY19mKG1fZGlzcGF0Y2hRdWV1ZS5n ZXQoKSwgbmV3IERpc3BhdGNoV29ya0l0ZW0geyBSZWYgeyAqdGhpcyB9LCBXVEZNb3ZlKGZ1bmN0 aW9uKSB9LCBkaXNwYXRjaFdvcmtJdGVtPERpc3BhdGNoV29ya0l0ZW0+KTsKIH0KIAordm9pZCBX b3JrUXVldWVCYXNlOjpkaXNwYXRjaFdpdGhRT1MoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9u LCBRT1MgcW9zKQoreworICAgIGRpc3BhdGNoX2Jsb2NrX3QgYmxvY2tXaXRoUU9TID0gZGlzcGF0 Y2hfYmxvY2tfY3JlYXRlX3dpdGhfcW9zX2NsYXNzKERJU1BBVENIX0JMT0NLX0VORk9SQ0VfUU9T X0NMQVNTLCBUaHJlYWQ6OmRpc3BhdGNoUU9TQ2xhc3MocW9zKSwgMCwgbWFrZUJsb2NrUHRyKFtm dW5jdGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pXSB7CisgICAgICAgIGZ1bmN0aW9uKCk7CisgICAg fSkuZ2V0KCkpOworICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgYmxv Y2tXaXRoUU9TKTsKKyNpZiAhX19oYXNfZmVhdHVyZShvYmpjX2FyYykKKyAgICBCbG9ja19yZWxl YXNlKGJsb2NrV2l0aFFPUyk7CisjZW5kaWYKK30KKwogdm9pZCBXb3JrUXVldWVCYXNlOjpkaXNw YXRjaEFmdGVyKFNlY29uZHMgZHVyYXRpb24sIEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikK IHsKICAgICBkaXNwYXRjaF9hZnRlcl9mKGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1cs IGR1cmF0aW9uLm5hbm9zZWNvbmRzQXM8aW50NjRfdD4oKSksIG1fZGlzcGF0Y2hRdWV1ZS5nZXQo KSwgbmV3IERpc3BhdGNoV29ya0l0ZW0geyBSZWYgeyAqdGhpcyB9LCAgV1RGTW92ZShmdW5jdGlv bikgfSwgZGlzcGF0Y2hXb3JrSXRlbTxEaXNwYXRjaFdvcmtJdGVtPik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCmluZGV4IGI4YTNlYTY1M2Y0ODRiNDY0MGQzMjM0 YzllZDNhN2Y2ODU0MDA2ZTguLmQzNGE0NDJhMzZlNDkwYjNkYWFiZTZiNzQyZjAyZDA0YmRiYzRl NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCkBAIC00NTMs NyArNDUzLDcgQEAgVW5pcXVlUmVmPEVuY29kZXI+IENvbm5lY3Rpb246OmNyZWF0ZVN5bmNNZXNz YWdlRW5jb2RlcihNZXNzYWdlTmFtZSBtZXNzYWdlTmFtZSwKICAgICByZXR1cm4gZW5jb2RlcjsK IH0KIAotYm9vbCBDb25uZWN0aW9uOjpzZW5kTWVzc2FnZShVbmlxdWVSZWY8RW5jb2Rlcj4mJiBl bmNvZGVyLCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMpCitib29sIENvbm5lY3Rp b246OnNlbmRNZXNzYWdlKFVuaXF1ZVJlZjxFbmNvZGVyPiYmIGVuY29kZXIsIE9wdGlvblNldDxT ZW5kT3B0aW9uPiBzZW5kT3B0aW9ucywgc3RkOjpvcHRpb25hbDxUaHJlYWQ6OlFPUz4gcW9zKQog ewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00OTMsOSAr NDkzLDE1IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UoVW5pcXVlUmVmPEVuY29kZXI+ JiYgZW5jb2RlciwgT3B0aW9uU2V0PFNlbmRPcHRpb24+CiAgICAgfQogICAgIAogICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgYWRkIGEgYm9vbGVhbiBmbGFnIHNvIHdlIGRvbid0IGNhbGwgdGhpcyB3 aGVuIHdvcmsgaGFzIGFscmVhZHkgYmVlbiBzY2hlZHVsZWQuCi0gICAgbV9jb25uZWN0aW9uUXVl dWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfV0oKSBtdXRhYmxlIHsK KyAgICBhdXRvIHNlbmRPdXRnb2luZ01lc3NhZ2VzID0gW3Byb3RlY3RlZFRoaXMgPSBSZWYgeyAq dGhpcyB9XSgpIG11dGFibGUgewogICAgICAgICBwcm90ZWN0ZWRUaGlzLT5zZW5kT3V0Z29pbmdN ZXNzYWdlcygpOwotICAgIH0pOworICAgIH07CisKKyAgICBpZiAocW9zKQorICAgICAgICBtX2Nv bm5lY3Rpb25RdWV1ZS0+ZGlzcGF0Y2hXaXRoUU9TKFdURk1vdmUoc2VuZE91dGdvaW5nTWVzc2Fn ZXMpLCAqcW9zKTsKKyAgICBlbHNlCisgICAgICAgIG1fY29ubmVjdGlvblF1ZXVlLT5kaXNwYXRj aChXVEZNb3ZlKHNlbmRPdXRnb2luZ01lc3NhZ2VzKSk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oIGIv U291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCmluZGV4IDIyMGU1ZWFiY2M0 MDk5NjhlZjdiZmYwMDllYzc2MjgyNWMzZTBjNTUuLjVjN2RlNTM5OWQwNjNmMWIwMmRjMWRmNThj MDg0MzQyNjdiNmJkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nv bm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgK QEAgLTI0OCw4ICsyNDgsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHBvc3RDb25uZWN0aW9uRGlk Q2xvc2VPbkNvbm5lY3Rpb25Xb3JrUXVldWUoKTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0 eXBlbmFtZSBDPiB1aW50NjRfdCBzZW5kV2l0aEFzeW5jUmVwbHkoVCYmIG1lc3NhZ2UsIEMmJiBj b21wbGV0aW9uSGFuZGxlciwgdWludDY0X3QgZGVzdGluYXRpb25JRCA9IDAsIE9wdGlvblNldDxT ZW5kT3B0aW9uPiA9IHsgfSk7IC8vIFRocmVhZC1zYWZlLgotICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQ+IGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9u U2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9KTsgLy8gVGhyZWFkLXNhZmUuCi0gICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGJvb2wgc2VuZChVbmlxdWVJRCwgVCYmIG1lc3Nh Z2UsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIE9wdGlvblNldDxTZW5kT3B0aW9uPiBzZW5kT3B0 aW9ucyA9IHsgfSk7IC8vIFRocmVhZC1zYWZlLgorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJv b2wgc2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNl bmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9LCBzdGQ6Om9wdGlvbmFsPFRocmVhZDo6UU9TPiBx b3MgPSBzdGQ6Om51bGxvcHQpOyAvLyBUaHJlYWQtc2FmZS4KKyAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiBzdGF0aWMgYm9vbCBzZW5kKFVuaXF1ZUlELCBUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVz dGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zID0geyB9LCBzdGQ6 Om9wdGlvbmFsPFRocmVhZDo6UU9TPiBxb3MgPSBzdGQ6Om51bGxvcHQpOyAvLyBUaHJlYWQtc2Fm ZS4KIAogICAgIC8vIFN5bmMgc2VuZGVycyBzaG91bGQgY2hlY2sgdGhlIFNlbmRTeW5jUmVzdWx0 IGZvciB0cnVlL2ZhbHNlIGluIGNhc2UgdGhleSBuZWVkIHRvIGtub3cgaWYgdGhlIHJlc3VsdCB3 YXMgcmVhbGx5IHJlY2VpdmVkLgogICAgIC8vIFN5bmMgc2VuZGVycyBzaG91bGQgaG9sZCBvbiB0 byB0aGUgU2VuZFN5bmNSZXN1bHQgaW4gY2FzZSB0aGV5IHJlZmVyZW5jZSB0aGUgY29udGVudHMg b2YgdGhlIHJlcGx5IHZpYSBEYXRhUmVmZXJlcmVuY2UgLyBBcnJheVJlZmVyZW5jZS4KQEAgLTI2 Nyw5ICsyNjcsOSBAQCBwdWJsaWM6CiAgICAgCiAgICAgLy8gVGhyZWFkLXNhZmUuCiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4KLSAgICBib29sIHNlbmQoVCYmIG1lc3NhZ2Us IE9iamVjdElkZW50aWZpZXI8VT4gZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNlbmRPcHRpb24+ IHNlbmRPcHRpb25zID0geyB9KQorICAgIGJvb2wgc2VuZChUJiYgbWVzc2FnZSwgT2JqZWN0SWRl bnRpZmllcjxVPiBkZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlv bnMgPSB7IH0sIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFvcyA9IHN0ZDo6bnVsbG9wdCkK ICAgICB7Ci0gICAgICAgIHJldHVybiBzZW5kPFQ+KFdURk1vdmUobWVzc2FnZSksIGRlc3RpbmF0 aW9uSUQudG9VSW50NjQoKSwgc2VuZE9wdGlvbnMpOworICAgICAgICByZXR1cm4gc2VuZDxUPihX VEZNb3ZlKG1lc3NhZ2UpLCBkZXN0aW5hdGlvbklELnRvVUludDY0KCksIHNlbmRPcHRpb25zLCBx b3MpOwogICAgIH0KIAogICAgIC8vIE1haW4gdGhyZWFkIG9ubHkuCkBAIC0yODYsNyArMjg2LDcg QEAgcHVibGljOgogICAgICAgICByZXR1cm4gd2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8 VD4oZGVzdGluYXRpb25JRC50b1VJbnQ2NCgpLCB0aW1lb3V0LCB3YWl0Rm9yT3B0aW9ucyk7CiAg ICAgfQogCi0gICAgYm9vbCBzZW5kTWVzc2FnZShVbmlxdWVSZWY8RW5jb2Rlcj4mJiwgT3B0aW9u U2V0PFNlbmRPcHRpb24+IHNlbmRPcHRpb25zKTsKKyAgICBib29sIHNlbmRNZXNzYWdlKFVuaXF1 ZVJlZjxFbmNvZGVyPiYmLCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6 b3B0aW9uYWw8VGhyZWFkOjpRT1M+ID0gc3RkOjpudWxsb3B0KTsKICAgICBVbmlxdWVSZWY8RW5j b2Rlcj4gY3JlYXRlU3luY01lc3NhZ2VFbmNvZGVyKE1lc3NhZ2VOYW1lLCB1aW50NjRfdCBkZXN0 aW5hdGlvbklELCBTeW5jUmVxdWVzdElEJik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+ IHNlbmRTeW5jTWVzc2FnZShTeW5jUmVxdWVzdElELCBVbmlxdWVSZWY8RW5jb2Rlcj4mJiwgVGlt ZW91dCwgT3B0aW9uU2V0PFNlbmRTeW5jT3B0aW9uPiBzZW5kU3luY09wdGlvbnMpOwogICAgIGJv b2wgc2VuZFN5bmNSZXBseShVbmlxdWVSZWY8RW5jb2Rlcj4mJik7CkBAIC01MTcsMjQgKzUxNywy NCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KLWJvb2wgQ29ubmVjdGlv bjo6c2VuZChUJiYgbWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgT3B0aW9uU2V0PFNl bmRPcHRpb24+IHNlbmRPcHRpb25zKQorYm9vbCBDb25uZWN0aW9uOjpzZW5kKFQmJiBtZXNzYWdl LCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8U2VuZE9wdGlvbj4gc2VuZE9wdGlv bnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFvcykKIHsKICAgICBDT01QSUxFX0FTU0VS VCghVDo6aXNTeW5jLCBBc3luY01lc3NhZ2VFeHBlY3RlZCk7CiAKICAgICBhdXRvIGVuY29kZXIg PSBtYWtlVW5pcXVlUmVmPEVuY29kZXI+KFQ6Om5hbWUoKSwgZGVzdGluYXRpb25JRCk7CiAgICAg ZW5jb2Rlci5nZXQoKSA8PCBtZXNzYWdlLmFyZ3VtZW50cygpOwogICAgIAotICAgIHJldHVybiBz ZW5kTWVzc2FnZShXVEZNb3ZlKGVuY29kZXIpLCBzZW5kT3B0aW9ucyk7CisgICAgcmV0dXJuIHNl bmRNZXNzYWdlKFdURk1vdmUoZW5jb2RlciksIHNlbmRPcHRpb25zLCBxb3MpOwogfQogCiB0ZW1w bGF0ZTx0eXBlbmFtZSBUPgotYm9vbCBDb25uZWN0aW9uOjpzZW5kKFVuaXF1ZUlEIGNvbm5lY3Rp b25JRCwgVCYmIG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIE9wdGlvblNldDxTZW5k T3B0aW9uPiBzZW5kT3B0aW9ucykKK2Jvb2wgQ29ubmVjdGlvbjo6c2VuZChVbmlxdWVJRCBjb25u ZWN0aW9uSUQsIFQmJiBtZXNzYWdlLCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBPcHRpb25TZXQ8 U2VuZE9wdGlvbj4gc2VuZE9wdGlvbnMsIHN0ZDo6b3B0aW9uYWw8VGhyZWFkOjpRT1M+IHFvcykK IHsKICAgICBMb2NrZXIgbG9ja2VyIHsgc19jb25uZWN0aW9uTWFwTG9jayB9OwogICAgIGF1dG8q IGNvbm5lY3Rpb24gPSBjb25uZWN0aW9uTWFwKCkuZ2V0KGNvbm5lY3Rpb25JRCk7CiAgICAgaWYg KCFjb25uZWN0aW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIGNvbm5lY3Rp b24tPnNlbmQoV1RGTW92ZShtZXNzYWdlKSwgZGVzdGluYXRpb25JRCwgc2VuZE9wdGlvbnMpOwor ICAgIHJldHVybiBjb25uZWN0aW9uLT5zZW5kKFdURk1vdmUobWVzc2FnZSksIGRlc3RpbmF0aW9u SUQsIHNlbmRPcHRpb25zLCBxb3MpOwogfQogCiB1aW50NjRfdCBuZXh0QXN5bmNSZXBseUhhbmRs ZXJJRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYzkz NjdiMDBmMWRiMDc3YjhjMmRkMmM5OWE3MWQ1Njc0YTlhYmRkZC4uNzE2MjdkMjRjM2U5MmZhOWEy ZTZjZTBkOWU2MGY4MDBkMWEwNGQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC0yOTI4LDEyICsyOTI4LDE2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZW5k V2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBldmVudCkKICAgICBtX3doZWVsRXZlbnRB Y3Rpdml0eUh5c3RlcmVzaXMuaW1wdWxzZSgpOwogI2VuZGlmCiAKKyAgICBhdXRvKiBjb25uZWN0 aW9uID0gbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKTsKKyAgICBpZiAoIWNvbm5lY3Rpb24pCisg ICAgICAgIHJldHVybjsKKwogICAgIGF1dG8gcnViYmVyQmFuZGFibGVFZGdlcyA9IHRoaXMtPnJ1 YmJlckJhbmRhYmxlRWRnZXMoKTsKICAgICBpZiAoc2hvdWxkVXNlSW1wbGljaXRSdWJiZXJCYW5k Q29udHJvbCgpKSB7CiAgICAgICAgIHJ1YmJlckJhbmRhYmxlRWRnZXMuc2V0TGVmdCghbV9iYWNr Rm9yd2FyZExpc3QtPmJhY2tJdGVtKCkpOwogICAgICAgICBydWJiZXJCYW5kYWJsZUVkZ2VzLnNl dFJpZ2h0KCFtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2FyZEl0ZW0oKSk7CiAgICAgfQotICAgIHNl bmQoTWVzc2FnZXM6OkV2ZW50RGlzcGF0Y2hlcjo6V2hlZWxFdmVudChtX3dlYlBhZ2VJRCwgZXZl bnQsIHJ1YmJlckJhbmRhYmxlRWRnZXMpLCAwKTsKKyAgICBjb25uZWN0aW9uLT5zZW5kKE1lc3Nh Z2VzOjpFdmVudERpc3BhdGNoZXI6OldoZWVsRXZlbnQobV93ZWJQYWdlSUQsIGV2ZW50LCBydWJi ZXJCYW5kYWJsZUVkZ2VzKSwgMCwgeyB9LCBUaHJlYWQ6OlFPUzo6VXNlckludGVyYWN0aXZlKTsK IAogICAgIC8vIE1hbnVhbGx5IHBpbmcgdGhlIHdlYiBwcm9jZXNzIHRvIGNoZWNrIGZvciByZXNw b25zaXZlbmVzcyBzaW5jZSBvdXIgd2hlZWwKICAgICAvLyBldmVudCB3aWxsIGRpc3BhdGNoIHRv IGEgbm9uLW1haW4gdGhyZWFkLCB3aGljaCBhbHdheXMgcmVzcG9uZHMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlzcGxheUxpbmsuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbWFjL0Rpc3BsYXlMaW5rLmNwcAppbmRleCA4ZGE5ZGE0MGVjZTFlYmMxM2Zj YmI5NGI2N2EwMGMwMWYyZmY1ZTlhLi4zODQ4ZmIxYWNlYTZmMWUyZWI3YTI3MjAwYTkyZDc2MjM4 ZWVhMTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlzcGxheUxp bmsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9EaXNwbGF5TGluay5jcHAK QEAgLTIzNiw5ICsyMzYsOSBAQCB2b2lkIERpc3BsYXlMaW5rOjpub3RpZnlPYnNlcnZlcnNEaXNw bGF5V2FzUmVmcmVzaGVkKCkKICAgICAgICAgICAgIDw8ICIgb2JzZXJ2ZXJzLCBvbiBiYWNrZ3Jv dW5kIHF1ZXVlICIgPDwgc2hvdWxkU2VuZElQQ09uQmFja2dyb3VuZFF1ZXVlIDw8ICIgbWF4RnJh bWVzUGVyU2Vjb25kICIgPDwgb2JzZXJ2ZXJzTWF4RnJhbWVzUGVyU2Vjb25kIDw8ICIgZnVsbCBz cGVlZCBjbGllbnRzICIgPDwgY29ubmVjdGlvbkluZm8uZnVsbFNwZWVkVXBkYXRlc0NsaWVudENv dW50IDw8ICIgcmVsZXZhbnQgIiA8PCBtYWluVGhyZWFkV2FudHNVcGRhdGUpOwogCiAgICAgICAg IGlmIChjb25uZWN0aW9uSW5mby5mdWxsU3BlZWRVcGRhdGVzQ2xpZW50Q291bnQpIHsKLSAgICAg ICAgICAgIElQQzo6Q29ubmVjdGlvbjo6c2VuZChjb25uZWN0aW9uSUQsIE1lc3NhZ2VzOjpFdmVu dERpc3BhdGNoZXI6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3VycmVudFVw ZGF0ZSwgbWFpblRocmVhZFdhbnRzVXBkYXRlKSwgMCk7CisgICAgICAgICAgICBJUEM6OkNvbm5l Y3Rpb246OnNlbmQoY29ubmVjdGlvbklELCBNZXNzYWdlczo6RXZlbnREaXNwYXRjaGVyOjpEaXNw bGF5V2FzUmVmcmVzaGVkKG1fZGlzcGxheUlELCBtX2N1cnJlbnRVcGRhdGUsIG1haW5UaHJlYWRX YW50c1VwZGF0ZSksIDAsIHsgfSwgVGhyZWFkOjpRT1M6OlVzZXJJbnRlcmFjdGl2ZSk7CiAgICAg ICAgIH0gZWxzZSBpZiAobWFpblRocmVhZFdhbnRzVXBkYXRlKQotICAgICAgICAgICAgSVBDOjpD b25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb25JRCwgTWVzc2FnZXM6OldlYlByb2Nlc3M6OkRpc3Bs YXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3VycmVudFVwZGF0ZSksIDApOworICAgICAg ICAgICAgSVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb25JRCwgTWVzc2FnZXM6OldlYlBy b2Nlc3M6OkRpc3BsYXlXYXNSZWZyZXNoZWQobV9kaXNwbGF5SUQsIG1fY3VycmVudFVwZGF0ZSks IDAsIHsgfSwgVGhyZWFkOjpRT1M6OlVzZXJJbnRlcmFjdGl2ZSk7CiAgICAgfQogCiAgICAgbV9j dXJyZW50VXBkYXRlID0gbV9jdXJyZW50VXBkYXRlLm5leHRVcGRhdGUoKTsK