226390 2021-05-28 12:41:41 -0700 Add a way to prefix output of `WTFReportBacktrace` to make log filtering easier 2021-09-12 21:16:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 230207 1 hi hi benjamin cdumez cmarcelo ews-watchlist fujii hi megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1764886 0 hi 2021-05-28 12:41:41 -0700 Often times while debugging I add `WTFLogAlways("<DR> ...")` to various places as indicators that "logic has reached here". This is especially useful when debugging iOS as unlike macOS there's no console output from `run-safari`, meaning that I have to use system logging, which is often a deluge of unrelated information. Having "<DR>" as a prefix makes filtering through the system logging trivial as I can ignore logs that don't have it. Unfortunately, `WTFReportBacktrace` does not have a way to add this prefix, so it becomes much harder to find in the logs. 1764887 1 430042 hi 2021-05-28 12:42:10 -0700 Created attachment 430042 Patch 1764888 2 430043 hi 2021-05-28 12:43:28 -0700 Created attachment 430043 Patch 1764963 3 430062 hi 2021-05-28 15:25:48 -0700 Created attachment 430062 Patch 1766103 4 430062 megan_gardner 2021-06-02 12:30:52 -0700 Comment on attachment 430062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430062&action=review > Source/WTF/wtf/Assertions.cpp:291 > void WTFReportBacktrace() Could you make it so this isn't duplicated code? 1766234 5 430062 hi 2021-06-02 17:33:01 -0700 Comment on attachment 430062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430062&action=review >> Source/WTF/wtf/Assertions.cpp:291 >> void WTFReportBacktrace() > > Could you make it so this isn't duplicated code? I thought about doing this by having `WTFReportBacktrace` call `WTFReportBacktraceWithPrefix("")`, but I think the issue there is that we'd then want to adjust `framesToSkip`. I'll take a stab at maybe using a `template` or something. 1766823 6 430062 hi 2021-06-04 10:20:44 -0700 Comment on attachment 430062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430062&action=review >>> Source/WTF/wtf/Assertions.cpp:291 >>> void WTFReportBacktrace() >> >> Could you make it so this isn't duplicated code? > > I thought about doing this by having `WTFReportBacktrace` call `WTFReportBacktraceWithPrefix("")`, but I think the issue there is that we'd then want to adjust `framesToSkip`. I'll take a stab at maybe using a `template` or something. Turns out that I can't use a `template` because it's `extern "C"` :/ I did experiment with something like `#define WTFReportBacktrace() WTFReportBacktraceWithPrefix("")`, but it was pointed out to me that that could have issues if WebKit clients (e.g. Safari) depend on that symbol. 1766839 7 ews-feeder 2021-06-04 10:58:44 -0700 Committed r278474 (238492@main): <https://commits.webkit.org/238492@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430062. 1766841 8 webkit-bug-importer 2021-06-04 10:59:19 -0700 <rdar://problem/78876754> 1792842 9 430062 fujii 2021-09-12 21:16:18 -0700 Comment on attachment 430062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430062&action=review > Source/WTF/wtf/StackTrace.h:104 > + const char* m_prefix; Adding a new member here is problematic. Filed: Bug 230207 – StackTrace outputs a garbage prefix because WTF::StackTrace::m_prefix is filled with the stack content 430042 2021-05-28 12:42:10 -0700 2021-05-28 12:43:28 -0700 Patch 226390.diff text/plain 5300 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZTJhYTRjZGM0MDY4Li5lMTVjYTFlOGFhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIw MjEtMDUtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBhIHdheSB0byBwcmVmaXggb3V0cHV0IG9mIGBXVEZSZXBvcnRCYWNrdHJhY2VgIHRvIG1ha2Ug bG9nIGZpbHRlcmluZyBlYXNpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNjM5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE9mdGVuIHRpbWVzIHdoaWxlIGRlYnVnZ2luZyBJIGFkZCBgV1RGTG9nQWx3 YXlzKCI8RFI+IC4uLiIpYCB0byB2YXJpb3VzIHBsYWNlcyBhcyBpbmRpY2F0b3JzCisgICAgICAg IHRoYXQgImxvZ2ljIGhhcyByZWFjaGVkIGhlcmUiLiBUaGlzIGlzIGVzcGVjaWFsbHkgdXNlZnVs IHdoZW4gZGVidWdnaW5nIGlPUyBhcyB1bmxpa2UgbWFjT1MKKyAgICAgICAgdGhlcmUncyBubyBj b25zb2xlIG91dHB1dCBmcm9tIGBydW4tc2FmYXJpYCwgbWVhbmluZyB0aGF0IEkgaGF2ZSB0byB1 c2Ugc3lzdGVtIGxvZ2dpbmcsCisgICAgICAgIHdoaWNoIGlzIG9mdGVuIGEgZGVsdWdlIG9mIHVu cmVsYXRlZCBpbmZvcm1hdGlvbi4gSGF2aW5nICI8RFI+IiBhcyBhIHByZWZpeCBtYWtlcyBmaWx0 ZXJpbmcKKyAgICAgICAgdGhyb3VnaCB0aGUgc3lzdGVtIGxvZ2dpbmcgdHJpdmlhbCBhcyBJIGNh biBpZ25vcmUgbG9ncyB0aGF0IGRvbid0IGhhdmUgaXQuIFVuZm9ydHVuYXRlbHksCisgICAgICAg IGBXVEZSZXBvcnRCYWNrdHJhY2VgIGRvZXMgbm90IGhhdmUgYSB3YXkgdG8gYWRkIHRoaXMgcHJl Zml4LCBzbyBpdCBiZWNvbWVzIG11Y2ggaGFyZGVyIHRvCisgICAgICAgIGZpbmQgaW4gdGhlIGxv Z3MuIFRoaXMgcGF0Y2ggZW5hYmxlcyBhZGRpbmcgYSBwcmVmaXggdG8gZWFjaCBsaW5lIG9mIGBX VEZSZXBvcnRCYWNrdHJhY2VgCisgICAgICAgIHZpYSBhIG5ldyBmdW5jdGlvbiBgV1RGUmVwb3J0 QmFjdHJhY2VXaXRoUHJlZml4YC4KKworICAgICAgICAqIHd0Zi9Bc3NlcnRpb25zLmg6CisgICAg ICAgICogd3RmL0Fzc2VydGlvbnMuY3BwOgorICAgICAgICAoV1RGUmVwb3J0QmFja3RyYWNlV2l0 aFByZWZpeCk6IEFkZGVkLgorICAgICAgICAoV1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KTog QWRkZWQuCisKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5oOgorICAgICAgICAoV1RGOjpTdGFj a1RyYWNlOjpTdGFja1RyYWNlKToKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5jcHA6CisgICAg ICAgIChXVEY6OlN0YWNrVHJhY2U6OmR1bXAgY29uc3QpOgorCiAyMDIxLTA1LTI3ICBTaWh1aSBM aXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFiYW5kb24gcGVuZGluZyB0YXNr cyBvbiBiYWNrZ3JvdW5kIHRocmVhZCB3aGVuIFdlYklEQlNlcnZlciBpcyBjbG9zZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwIGIvU291cmNlL1dURi93dGYvQXNz ZXJ0aW9ucy5jcHAKaW5kZXggNWEwYzdlNzg5MzljLi5lMDk2YTAzMmM4OTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Fzc2Vy dGlvbnMuY3BwCkBAIC0yNzcsNiArMjc3LDE3IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCit2b2lk IFdURlJlcG9ydEJhY2t0cmFjZVdpdGhQcmVmaXgoY29uc3QgY2hhciogcHJlZml4KQoreworICAg IHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOworICAgIHN0YXRpYyBjb25z dGV4cHIgaW50IGZyYW1lc1RvU2tpcCA9IDI7CisgICAgdm9pZCogc2FtcGxlc1tmcmFtZXNUb1No b3cgKyBmcmFtZXNUb1NraXBdOworICAgIGludCBmcmFtZXMgPSBmcmFtZXNUb1Nob3cgKyBmcmFt ZXNUb1NraXA7CisKKyAgICBXVEZHZXRCYWNrdHJhY2Uoc2FtcGxlcywgJmZyYW1lcyk7CisgICAg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1l cyAtIGZyYW1lc1RvU2tpcCwgcHJlZml4KTsKK30KKwogdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2Uo KQogewogICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOwpAQCAtMjg4 LDEzICsyOTksMTggQEAgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2UoKQogICAgIFdURlByaW50QmFj a3RyYWNlKHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1lcyAtIGZyYW1lc1RvU2tpcCk7CiB9 CiAKLXZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3ZvaWQg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHZvaWQqKiBzdGFjaywgaW50IHNpemUsIGNvbnN0 IGNoYXIqIHByZWZpeCkKIHsKICAgICBDcmFzaExvZ1ByaW50U3RyZWFtIG91dDsKLSAgICBTdGFj a1RyYWNlIHN0YWNrVHJhY2Uoc3RhY2ssIHNpemUpOworICAgIFN0YWNrVHJhY2Ugc3RhY2tUcmFj ZShzdGFjaywgc2l6ZSwgcHJlZml4KTsKICAgICBvdXQucHJpbnQoc3RhY2tUcmFjZSk7CiB9CiAK K3ZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3sKKyAgICBX VEZQcmludEJhY2t0cmFjZVdpdGhQcmVmaXgoc3RhY2ssIHNpemUsICIiKTsKK30KKwogI2lmICFk ZWZpbmVkKE5ERUJVRykgfHwgIShPUyhEQVJXSU4pIHx8IFBMQVRGT1JNKFBMQVlTVEFUSU9OKSkK IHZvaWQgV1RGQ3Jhc2goKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQXNzZXJ0aW9u cy5oIGIvU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCmluZGV4IDEwOTM0YWU0MDlmOS4uMjc3 YzIyYmNmZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgKKysrIGIv U291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCkBAIC0yMTgsNyArMjE4LDkgQEAgV1RGX0VYUE9S VF9QUklWQVRFIHZvaWQgV1RGU2V0TG9nQ2hhbm5lbExldmVsKFdURkxvZ0NoYW5uZWwqLCBXVEZM b2dMZXZlbCk7CiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBXVEZXaWxsTG9nV2l0aExldmVsKFdU RkxvZ0NoYW5uZWwqLCBXVEZMb2dMZXZlbCk7CiAKIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIFdU RkdldEJhY2t0cmFjZSh2b2lkKiogc3RhY2ssIGludCogc2l6ZSk7CitXVEZfRVhQT1JUX1BSSVZB VEUgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2VXaXRoUHJlZml4KGNvbnN0IGNoYXIqKTsKIFdURl9F WFBPUlRfUFJJVkFURSB2b2lkIFdURlJlcG9ydEJhY2t0cmFjZSh2b2lkKTsKK1dURl9FWFBPUlRf UFJJVkFURSB2b2lkIFdURlByaW50QmFja3RyYWNlV2l0aFByZWZpeCh2b2lkKiogc3RhY2ssIGlu dCBzaXplLCBjb25zdCBjaGFyKiBwcmVmaXgpOwogV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgV1RG UHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSk7CiAjaWYgIVJFTEVBU0VfTE9H X0RJU0FCTEVECiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBXVEZSZWxlYXNlTG9nU3RhY2tUcmFj ZShXVEZMb2dDaGFubmVsKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNl LmNwcCBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuY3BwCmluZGV4IDdiZjA5ODg3NDcxZS4u MmYzYzRkZDk2YjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcApAQCAtMTQxLDkgKzE0MSw5IEBAIHZv aWQgU3RhY2tUcmFjZTo6ZHVtcChQcmludFN0cmVhbSYgb3V0LCBjb25zdCBjaGFyKiBpbmRlbnRT dHJpbmcpIGNvbnN0CiAgICAgICAgIH0KICAgICAgICAgY29uc3QgaW50IGZyYW1lTnVtYmVyID0g aSArIDE7CiAgICAgICAgIGlmIChtYW5nbGVkTmFtZSB8fCBjeGFEZW1hbmdsZWQpCi0gICAgICAg ICAgICBvdXQucHJpbnRmKCIlcyUtM2QgJXAgJXNcbiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1i ZXIsIHN0YWNrW2ldLCBjeGFEZW1hbmdsZWQgPyBjeGFEZW1hbmdsZWQgOiBtYW5nbGVkTmFtZSk7 CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcyVzJS0zZCAlcCAlc1xuIiwgbV9wcmVmaXggPzog IiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1iZXIsIHN0YWNrW2ldLCBjeGFEZW1hbmdsZWQgPyBj eGFEZW1hbmdsZWQgOiBtYW5nbGVkTmFtZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG91 dC5wcmludGYoIiVzJS0zZCAlcFxuIiwgaW5kZW50U3RyaW5nLCBmcmFtZU51bWJlciwgc3RhY2tb aV0pOworICAgICAgICAgICAgb3V0LnByaW50ZigiJXMlcyUtM2QgJXBcbiIsIG1fcHJlZml4ID86 ICIiLCBpbmRlbnRTdHJpbmcsIGZyYW1lTnVtYmVyLCBzdGFja1tpXSk7CiAgICAgfQogCiAjaWYg SEFWRShCQUNLVFJBQ0VfU1lNQk9MUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1N0YWNr VHJhY2UuaCBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuaAppbmRleCA4NmVkNGI4MDhjYmMu LjRhZTdjZDdjNThkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvU3RhY2tUcmFjZS5oCisr KyBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuaApAQCAtMzksMTAgKzM5LDExIEBAIHB1Ymxp YzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxTdGFja1Ry YWNlPiBjYXB0dXJlU3RhY2tUcmFjZShpbnQgbWF4RnJhbWVzLCBpbnQgZnJhbWVzVG9Ta2lwID0g MCk7CiAKICAgICAvLyBCb3Jyb3dlZCBzdGFjayB0cmFjZS4KLSAgICBTdGFja1RyYWNlKHZvaWQq KiBzdGFjaywgaW50IHNpemUpCisgICAgU3RhY2tUcmFjZSh2b2lkKiogc3RhY2ssIGludCBzaXpl LCBjb25zdCBjaGFyKiBwcmVmaXggPSAiIikKICAgICAgICAgOiBtX3NpemUoc2l6ZSkKICAgICAg ICAgLCBtX2NhcGFjaXR5KDApCiAgICAgICAgICwgbV9ib3Jyb3dlZFN0YWNrKHN0YWNrKQorICAg ICAgICAsIG1fcHJlZml4KHByZWZpeCkKICAgICB7IH0KIAogICAgIGludCBzaXplKCkgY29uc3Qg eyByZXR1cm4gbV9zaXplOyB9CkBAIC05OSw2ICsxMDAsOCBAQCBwcml2YXRlOgogICAgICAgICB2 b2lkKiogbV9ib3Jyb3dlZFN0YWNrOwogICAgICAgICB2b2lkKiBtX3N0YWNrWzFdOwogICAgIH07 CisKKyAgICBjb25zdCBjaGFyKiBtX3ByZWZpeDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdURgo= 430043 2021-05-28 12:43:28 -0700 2021-05-28 15:25:48 -0700 Patch 226390.diff text/plain 5300 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZTJhYTRjZGM0MDY4Li5lMTVjYTFlOGFhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIw MjEtMDUtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBhIHdheSB0byBwcmVmaXggb3V0cHV0IG9mIGBXVEZSZXBvcnRCYWNrdHJhY2VgIHRvIG1ha2Ug bG9nIGZpbHRlcmluZyBlYXNpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNjM5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE9mdGVuIHRpbWVzIHdoaWxlIGRlYnVnZ2luZyBJIGFkZCBgV1RGTG9nQWx3 YXlzKCI8RFI+IC4uLiIpYCB0byB2YXJpb3VzIHBsYWNlcyBhcyBpbmRpY2F0b3JzCisgICAgICAg IHRoYXQgImxvZ2ljIGhhcyByZWFjaGVkIGhlcmUiLiBUaGlzIGlzIGVzcGVjaWFsbHkgdXNlZnVs IHdoZW4gZGVidWdnaW5nIGlPUyBhcyB1bmxpa2UgbWFjT1MKKyAgICAgICAgdGhlcmUncyBubyBj b25zb2xlIG91dHB1dCBmcm9tIGBydW4tc2FmYXJpYCwgbWVhbmluZyB0aGF0IEkgaGF2ZSB0byB1 c2Ugc3lzdGVtIGxvZ2dpbmcsCisgICAgICAgIHdoaWNoIGlzIG9mdGVuIGEgZGVsdWdlIG9mIHVu cmVsYXRlZCBpbmZvcm1hdGlvbi4gSGF2aW5nICI8RFI+IiBhcyBhIHByZWZpeCBtYWtlcyBmaWx0 ZXJpbmcKKyAgICAgICAgdGhyb3VnaCB0aGUgc3lzdGVtIGxvZ2dpbmcgdHJpdmlhbCBhcyBJIGNh biBpZ25vcmUgbG9ncyB0aGF0IGRvbid0IGhhdmUgaXQuIFVuZm9ydHVuYXRlbHksCisgICAgICAg IGBXVEZSZXBvcnRCYWNrdHJhY2VgIGRvZXMgbm90IGhhdmUgYSB3YXkgdG8gYWRkIHRoaXMgcHJl Zml4LCBzbyBpdCBiZWNvbWVzIG11Y2ggaGFyZGVyIHRvCisgICAgICAgIGZpbmQgaW4gdGhlIGxv Z3MuIFRoaXMgcGF0Y2ggZW5hYmxlcyBhZGRpbmcgYSBwcmVmaXggdG8gZWFjaCBsaW5lIG9mIGBX VEZSZXBvcnRCYWNrdHJhY2VgCisgICAgICAgIHZpYSBhIG5ldyBmdW5jdGlvbiBgV1RGUmVwb3J0 QmFjdHJhY2VXaXRoUHJlZml4YC4KKworICAgICAgICAqIHd0Zi9Bc3NlcnRpb25zLmg6CisgICAg ICAgICogd3RmL0Fzc2VydGlvbnMuY3BwOgorICAgICAgICAoV1RGUmVwb3J0QmFja3RyYWNlV2l0 aFByZWZpeCk6IEFkZGVkLgorICAgICAgICAoV1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KTog QWRkZWQuCisKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5oOgorICAgICAgICAoV1RGOjpTdGFj a1RyYWNlOjpTdGFja1RyYWNlKToKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5jcHA6CisgICAg ICAgIChXVEY6OlN0YWNrVHJhY2U6OmR1bXAgY29uc3QpOgorCiAyMDIxLTA1LTI3ICBTaWh1aSBM aXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFiYW5kb24gcGVuZGluZyB0YXNr cyBvbiBiYWNrZ3JvdW5kIHRocmVhZCB3aGVuIFdlYklEQlNlcnZlciBpcyBjbG9zZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwIGIvU291cmNlL1dURi93dGYvQXNz ZXJ0aW9ucy5jcHAKaW5kZXggNWEwYzdlNzg5MzljLi5lMDk2YTAzMmM4OTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Fzc2Vy dGlvbnMuY3BwCkBAIC0yNzcsNiArMjc3LDE3IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCit2b2lk IFdURlJlcG9ydEJhY2t0cmFjZVdpdGhQcmVmaXgoY29uc3QgY2hhciogcHJlZml4KQoreworICAg IHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOworICAgIHN0YXRpYyBjb25z dGV4cHIgaW50IGZyYW1lc1RvU2tpcCA9IDI7CisgICAgdm9pZCogc2FtcGxlc1tmcmFtZXNUb1No b3cgKyBmcmFtZXNUb1NraXBdOworICAgIGludCBmcmFtZXMgPSBmcmFtZXNUb1Nob3cgKyBmcmFt ZXNUb1NraXA7CisKKyAgICBXVEZHZXRCYWNrdHJhY2Uoc2FtcGxlcywgJmZyYW1lcyk7CisgICAg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1l cyAtIGZyYW1lc1RvU2tpcCwgcHJlZml4KTsKK30KKwogdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2Uo KQogewogICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOwpAQCAtMjg4 LDEzICsyOTksMTggQEAgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2UoKQogICAgIFdURlByaW50QmFj a3RyYWNlKHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1lcyAtIGZyYW1lc1RvU2tpcCk7CiB9 CiAKLXZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3ZvaWQg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHZvaWQqKiBzdGFjaywgaW50IHNpemUsIGNvbnN0 IGNoYXIqIHByZWZpeCkKIHsKICAgICBDcmFzaExvZ1ByaW50U3RyZWFtIG91dDsKLSAgICBTdGFj a1RyYWNlIHN0YWNrVHJhY2Uoc3RhY2ssIHNpemUpOworICAgIFN0YWNrVHJhY2Ugc3RhY2tUcmFj ZShzdGFjaywgc2l6ZSwgcHJlZml4KTsKICAgICBvdXQucHJpbnQoc3RhY2tUcmFjZSk7CiB9CiAK K3ZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3sKKyAgICBX VEZQcmludEJhY2t0cmFjZVdpdGhQcmVmaXgoc3RhY2ssIHNpemUsICIiKTsKK30KKwogI2lmICFk ZWZpbmVkKE5ERUJVRykgfHwgIShPUyhEQVJXSU4pIHx8IFBMQVRGT1JNKFBMQVlTVEFUSU9OKSkK IHZvaWQgV1RGQ3Jhc2goKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQXNzZXJ0aW9u cy5oIGIvU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCmluZGV4IDEwOTM0YWU0MDlmOS4uMjc3 YzIyYmNmZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgKKysrIGIv U291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCkBAIC0yMTgsNyArMjE4LDkgQEAgV1RGX0VYUE9S VF9QUklWQVRFIHZvaWQgV1RGU2V0TG9nQ2hhbm5lbExldmVsKFdURkxvZ0NoYW5uZWwqLCBXVEZM b2dMZXZlbCk7CiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBXVEZXaWxsTG9nV2l0aExldmVsKFdU RkxvZ0NoYW5uZWwqLCBXVEZMb2dMZXZlbCk7CiAKIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIFdU RkdldEJhY2t0cmFjZSh2b2lkKiogc3RhY2ssIGludCogc2l6ZSk7CitXVEZfRVhQT1JUX1BSSVZB VEUgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2VXaXRoUHJlZml4KGNvbnN0IGNoYXIqKTsKIFdURl9F WFBPUlRfUFJJVkFURSB2b2lkIFdURlJlcG9ydEJhY2t0cmFjZSh2b2lkKTsKK1dURl9FWFBPUlRf UFJJVkFURSB2b2lkIFdURlByaW50QmFja3RyYWNlV2l0aFByZWZpeCh2b2lkKiogc3RhY2ssIGlu dCBzaXplLCBjb25zdCBjaGFyKiBwcmVmaXgpOwogV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgV1RG UHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSk7CiAjaWYgIVJFTEVBU0VfTE9H X0RJU0FCTEVECiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBXVEZSZWxlYXNlTG9nU3RhY2tUcmFj ZShXVEZMb2dDaGFubmVsKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNl LmNwcCBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuY3BwCmluZGV4IDdiZjA5ODg3NDcxZS4u MmYzYzRkZDk2YjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcApAQCAtMTQxLDkgKzE0MSw5IEBAIHZv aWQgU3RhY2tUcmFjZTo6ZHVtcChQcmludFN0cmVhbSYgb3V0LCBjb25zdCBjaGFyKiBpbmRlbnRT dHJpbmcpIGNvbnN0CiAgICAgICAgIH0KICAgICAgICAgY29uc3QgaW50IGZyYW1lTnVtYmVyID0g aSArIDE7CiAgICAgICAgIGlmIChtYW5nbGVkTmFtZSB8fCBjeGFEZW1hbmdsZWQpCi0gICAgICAg ICAgICBvdXQucHJpbnRmKCIlcyUtM2QgJXAgJXNcbiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1i ZXIsIHN0YWNrW2ldLCBjeGFEZW1hbmdsZWQgPyBjeGFEZW1hbmdsZWQgOiBtYW5nbGVkTmFtZSk7 CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcyVzJS0zZCAlcCAlc1xuIiwgbV9wcmVmaXggPzog IiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1iZXIsIHN0YWNrW2ldLCBjeGFEZW1hbmdsZWQgPyBj eGFEZW1hbmdsZWQgOiBtYW5nbGVkTmFtZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG91 dC5wcmludGYoIiVzJS0zZCAlcFxuIiwgaW5kZW50U3RyaW5nLCBmcmFtZU51bWJlciwgc3RhY2tb aV0pOworICAgICAgICAgICAgb3V0LnByaW50ZigiJXMlcyUtM2QgJXBcbiIsIG1fcHJlZml4ID86 ICIiLCBpbmRlbnRTdHJpbmcsIGZyYW1lTnVtYmVyLCBzdGFja1tpXSk7CiAgICAgfQogCiAjaWYg SEFWRShCQUNLVFJBQ0VfU1lNQk9MUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1N0YWNr VHJhY2UuaCBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuaAppbmRleCA4NmVkNGI4MDhjYmMu LjRhZTdjZDdjNThkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvU3RhY2tUcmFjZS5oCisr KyBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuaApAQCAtMzksMTAgKzM5LDExIEBAIHB1Ymxp YzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxTdGFja1Ry YWNlPiBjYXB0dXJlU3RhY2tUcmFjZShpbnQgbWF4RnJhbWVzLCBpbnQgZnJhbWVzVG9Ta2lwID0g MCk7CiAKICAgICAvLyBCb3Jyb3dlZCBzdGFjayB0cmFjZS4KLSAgICBTdGFja1RyYWNlKHZvaWQq KiBzdGFjaywgaW50IHNpemUpCisgICAgU3RhY2tUcmFjZSh2b2lkKiogc3RhY2ssIGludCBzaXpl LCBjb25zdCBjaGFyKiBwcmVmaXggPSAiIikKICAgICAgICAgOiBtX3NpemUoc2l6ZSkKICAgICAg ICAgLCBtX2NhcGFjaXR5KDApCiAgICAgICAgICwgbV9ib3Jyb3dlZFN0YWNrKHN0YWNrKQorICAg ICAgICAsIG1fcHJlZml4KHByZWZpeCkKICAgICB7IH0KIAogICAgIGludCBzaXplKCkgY29uc3Qg eyByZXR1cm4gbV9zaXplOyB9CkBAIC05OSw2ICsxMDAsOCBAQCBwcml2YXRlOgogICAgICAgICB2 b2lkKiogbV9ib3Jyb3dlZFN0YWNrOwogICAgICAgICB2b2lkKiBtX3N0YWNrWzFdOwogICAgIH07 CisKKyAgICBjb25zdCBjaGFyKiBtX3ByZWZpeDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdURgo= 430062 2021-05-28 15:25:48 -0700 2021-06-04 10:58:45 -0700 Patch 226390.diff text/plain 5320 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZTJhYTRjZGM0MDY4Li5lMTVjYTFlOGFhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIw MjEtMDUtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBhIHdheSB0byBwcmVmaXggb3V0cHV0IG9mIGBXVEZSZXBvcnRCYWNrdHJhY2VgIHRvIG1ha2Ug bG9nIGZpbHRlcmluZyBlYXNpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNjM5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE9mdGVuIHRpbWVzIHdoaWxlIGRlYnVnZ2luZyBJIGFkZCBgV1RGTG9nQWx3 YXlzKCI8RFI+IC4uLiIpYCB0byB2YXJpb3VzIHBsYWNlcyBhcyBpbmRpY2F0b3JzCisgICAgICAg IHRoYXQgImxvZ2ljIGhhcyByZWFjaGVkIGhlcmUiLiBUaGlzIGlzIGVzcGVjaWFsbHkgdXNlZnVs IHdoZW4gZGVidWdnaW5nIGlPUyBhcyB1bmxpa2UgbWFjT1MKKyAgICAgICAgdGhlcmUncyBubyBj b25zb2xlIG91dHB1dCBmcm9tIGBydW4tc2FmYXJpYCwgbWVhbmluZyB0aGF0IEkgaGF2ZSB0byB1 c2Ugc3lzdGVtIGxvZ2dpbmcsCisgICAgICAgIHdoaWNoIGlzIG9mdGVuIGEgZGVsdWdlIG9mIHVu cmVsYXRlZCBpbmZvcm1hdGlvbi4gSGF2aW5nICI8RFI+IiBhcyBhIHByZWZpeCBtYWtlcyBmaWx0 ZXJpbmcKKyAgICAgICAgdGhyb3VnaCB0aGUgc3lzdGVtIGxvZ2dpbmcgdHJpdmlhbCBhcyBJIGNh biBpZ25vcmUgbG9ncyB0aGF0IGRvbid0IGhhdmUgaXQuIFVuZm9ydHVuYXRlbHksCisgICAgICAg IGBXVEZSZXBvcnRCYWNrdHJhY2VgIGRvZXMgbm90IGhhdmUgYSB3YXkgdG8gYWRkIHRoaXMgcHJl Zml4LCBzbyBpdCBiZWNvbWVzIG11Y2ggaGFyZGVyIHRvCisgICAgICAgIGZpbmQgaW4gdGhlIGxv Z3MuIFRoaXMgcGF0Y2ggZW5hYmxlcyBhZGRpbmcgYSBwcmVmaXggdG8gZWFjaCBsaW5lIG9mIGBX VEZSZXBvcnRCYWNrdHJhY2VgCisgICAgICAgIHZpYSBhIG5ldyBmdW5jdGlvbiBgV1RGUmVwb3J0 QmFjdHJhY2VXaXRoUHJlZml4YC4KKworICAgICAgICAqIHd0Zi9Bc3NlcnRpb25zLmg6CisgICAg ICAgICogd3RmL0Fzc2VydGlvbnMuY3BwOgorICAgICAgICAoV1RGUmVwb3J0QmFja3RyYWNlV2l0 aFByZWZpeCk6IEFkZGVkLgorICAgICAgICAoV1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KTog QWRkZWQuCisKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5oOgorICAgICAgICAoV1RGOjpTdGFj a1RyYWNlOjpTdGFja1RyYWNlKToKKyAgICAgICAgKiB3dGYvU3RhY2tUcmFjZS5jcHA6CisgICAg ICAgIChXVEY6OlN0YWNrVHJhY2U6OmR1bXAgY29uc3QpOgorCiAyMDIxLTA1LTI3ICBTaWh1aSBM aXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFiYW5kb24gcGVuZGluZyB0YXNr cyBvbiBiYWNrZ3JvdW5kIHRocmVhZCB3aGVuIFdlYklEQlNlcnZlciBpcyBjbG9zZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwIGIvU291cmNlL1dURi93dGYvQXNz ZXJ0aW9ucy5jcHAKaW5kZXggNWEwYzdlNzg5MzljLi5lMDk2YTAzMmM4OTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Fzc2Vy dGlvbnMuY3BwCkBAIC0yNzcsNiArMjc3LDE3IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCit2b2lk IFdURlJlcG9ydEJhY2t0cmFjZVdpdGhQcmVmaXgoY29uc3QgY2hhciogcHJlZml4KQoreworICAg IHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOworICAgIHN0YXRpYyBjb25z dGV4cHIgaW50IGZyYW1lc1RvU2tpcCA9IDI7CisgICAgdm9pZCogc2FtcGxlc1tmcmFtZXNUb1No b3cgKyBmcmFtZXNUb1NraXBdOworICAgIGludCBmcmFtZXMgPSBmcmFtZXNUb1Nob3cgKyBmcmFt ZXNUb1NraXA7CisKKyAgICBXVEZHZXRCYWNrdHJhY2Uoc2FtcGxlcywgJmZyYW1lcyk7CisgICAg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1l cyAtIGZyYW1lc1RvU2tpcCwgcHJlZml4KTsKK30KKwogdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2Uo KQogewogICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IGZyYW1lc1RvU2hvdyA9IDMxOwpAQCAtMjg4 LDEzICsyOTksMTggQEAgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2UoKQogICAgIFdURlByaW50QmFj a3RyYWNlKHNhbXBsZXMgKyBmcmFtZXNUb1NraXAsIGZyYW1lcyAtIGZyYW1lc1RvU2tpcCk7CiB9 CiAKLXZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3ZvaWQg V1RGUHJpbnRCYWNrdHJhY2VXaXRoUHJlZml4KHZvaWQqKiBzdGFjaywgaW50IHNpemUsIGNvbnN0 IGNoYXIqIHByZWZpeCkKIHsKICAgICBDcmFzaExvZ1ByaW50U3RyZWFtIG91dDsKLSAgICBTdGFj a1RyYWNlIHN0YWNrVHJhY2Uoc3RhY2ssIHNpemUpOworICAgIFN0YWNrVHJhY2Ugc3RhY2tUcmFj ZShzdGFjaywgc2l6ZSwgcHJlZml4KTsKICAgICBvdXQucHJpbnQoc3RhY2tUcmFjZSk7CiB9CiAK K3ZvaWQgV1RGUHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKK3sKKyAgICBX VEZQcmludEJhY2t0cmFjZVdpdGhQcmVmaXgoc3RhY2ssIHNpemUsICIiKTsKK30KKwogI2lmICFk ZWZpbmVkKE5ERUJVRykgfHwgIShPUyhEQVJXSU4pIHx8IFBMQVRGT1JNKFBMQVlTVEFUSU9OKSkK IHZvaWQgV1RGQ3Jhc2goKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQXNzZXJ0aW9u cy5oIGIvU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCmluZGV4IDEwOTM0YWU0MDlmOS4uMjc3 YzIyYmNmZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgKKysrIGIv U291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCkBAIC0yMTgsNyArMjE4LDkgQEAgV1RGX0VYUE9S VF9QUklWQVRFIHZvaWQgV1RGU2V0TG9nQ2hhbm5lbExldmVsKFdURkxvZ0NoYW5uZWwqLCBXVEZM b2dMZXZlbCk7CiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBXVEZXaWxsTG9nV2l0aExldmVsKFdU RkxvZ0NoYW5uZWwqLCBXVEZMb2dMZXZlbCk7CiAKIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIFdU RkdldEJhY2t0cmFjZSh2b2lkKiogc3RhY2ssIGludCogc2l6ZSk7CitXVEZfRVhQT1JUX1BSSVZB VEUgdm9pZCBXVEZSZXBvcnRCYWNrdHJhY2VXaXRoUHJlZml4KGNvbnN0IGNoYXIqKTsKIFdURl9F WFBPUlRfUFJJVkFURSB2b2lkIFdURlJlcG9ydEJhY2t0cmFjZSh2b2lkKTsKK1dURl9FWFBPUlRf UFJJVkFURSB2b2lkIFdURlByaW50QmFja3RyYWNlV2l0aFByZWZpeCh2b2lkKiogc3RhY2ssIGlu dCBzaXplLCBjb25zdCBjaGFyKiBwcmVmaXgpOwogV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgV1RG UHJpbnRCYWNrdHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSk7CiAjaWYgIVJFTEVBU0VfTE9H X0RJU0FCTEVECiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBXVEZSZWxlYXNlTG9nU3RhY2tUcmFj ZShXVEZMb2dDaGFubmVsKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNl LmNwcCBiL1NvdXJjZS9XVEYvd3RmL1N0YWNrVHJhY2UuY3BwCmluZGV4IDdiZjA5ODg3NDcxZS4u MmYzYzRkZDk2YjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9TdGFja1RyYWNlLmNwcApAQCAtMTQxLDkgKzE0MSw5IEBAIHZv aWQgU3RhY2tUcmFjZTo6ZHVtcChQcmludFN0cmVhbSYgb3V0LCBjb25zdCBjaGFyKiBpbmRlbnRT dHJpbmcpIGNvbnN0CiAgICAgICAgIH0KICAgICAgICAgY29uc3QgaW50IGZyYW1lTnVtYmVyID0g aSArIDE7CiAgICAgICAgIGlmIChtYW5nbGVkTmFtZSB8fCBjeGFEZW1hbmdsZWQpCi0gICAgICAg ICAgICBvdXQucHJpbnRmKCIlcyUtM2QgJXAgJXNcbiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1i ZXIsIHN0YWNrW2ldLCBjeGFEZW1hbmdsZWQgPyBjeGFEZW1hbmdsZWQgOiBtYW5nbGVkTmFtZSk7 CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcyVzJS0zZCAlcCAlc1xuIiwgbV9wcmVmaXggPyBt X3ByZWZpeCA6ICIiLCBpbmRlbnRTdHJpbmcsIGZyYW1lTnVtYmVyLCBzdGFja1tpXSwgY3hhRGVt YW5nbGVkID8gY3hhRGVtYW5nbGVkIDogbWFuZ2xlZE5hbWUpOwogICAgICAgICBlbHNlCi0gICAg ICAgICAgICBvdXQucHJpbnRmKCIlcyUtM2QgJXBcbiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1i ZXIsIHN0YWNrW2ldKTsKKyAgICAgICAgICAgIG91dC5wcmludGYoIiVzJXMlLTNkICVwXG4iLCBt X3ByZWZpeCA/IG1fcHJlZml4IDogIiIsIGluZGVudFN0cmluZywgZnJhbWVOdW1iZXIsIHN0YWNr W2ldKTsKICAgICB9CiAKICNpZiBIQVZFKEJBQ0tUUkFDRV9TWU1CT0xTKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dURi93dGYvU3RhY2tUcmFjZS5oIGIvU291cmNlL1dURi93dGYvU3RhY2tUcmFjZS5o CmluZGV4IDg2ZWQ0YjgwOGNiYy4uNGFlN2NkN2M1OGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RG L3d0Zi9TdGFja1RyYWNlLmgKKysrIGIvU291cmNlL1dURi93dGYvU3RhY2tUcmFjZS5oCkBAIC0z OSwxMCArMzksMTEgQEAgcHVibGljOgogICAgIFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPFN0YWNrVHJhY2U+IGNhcHR1cmVTdGFja1RyYWNlKGludCBtYXhGcmFtZXMs IGludCBmcmFtZXNUb1NraXAgPSAwKTsKIAogICAgIC8vIEJvcnJvd2VkIHN0YWNrIHRyYWNlLgot ICAgIFN0YWNrVHJhY2Uodm9pZCoqIHN0YWNrLCBpbnQgc2l6ZSkKKyAgICBTdGFja1RyYWNlKHZv aWQqKiBzdGFjaywgaW50IHNpemUsIGNvbnN0IGNoYXIqIHByZWZpeCA9ICIiKQogICAgICAgICA6 IG1fc2l6ZShzaXplKQogICAgICAgICAsIG1fY2FwYWNpdHkoMCkKICAgICAgICAgLCBtX2JvcnJv d2VkU3RhY2soc3RhY2spCisgICAgICAgICwgbV9wcmVmaXgocHJlZml4KQogICAgIHsgfQogCiAg ICAgaW50IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KQEAgLTk5LDYgKzEwMCw4IEBA IHByaXZhdGU6CiAgICAgICAgIHZvaWQqKiBtX2JvcnJvd2VkU3RhY2s7CiAgICAgICAgIHZvaWQq IG1fc3RhY2tbMV07CiAgICAgfTsKKworICAgIGNvbnN0IGNoYXIqIG1fcHJlZml4OwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV1RGCg==