217879 2020-10-17 14:15:34 -0700 test262: test/language/expressions/conditional/in-branch-1.js 2020-10-19 14:15:19 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 m m ashvayka darin ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1699000 0 m 2020-10-17 14:15:34 -0700 The in-branch-1 test262 test is failing, which checks that the `in` keyword is allowed in the LHS of a ternary (between `?` and `:`) even if that ternary is one of the expressions in a `for` statement. 1699042 1 411692 m 2020-10-17 18:36:24 -0700 Created attachment 411692 Patch 1699045 2 m 2020-10-17 18:41:57 -0700 I ran test262 before and after and I can confirm that this patch only affects in-branch-1. I also ran run-javascriptcore-tests and got 0 failures. 1699126 3 411692 darin 2020-10-18 13:32:00 -0700 Comment on attachment 411692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411692&action=review WebKit project bug fixes require including a test with the patch. Given this fixes a test, why is there no change to test expectations showing the newly passing test? > Source/JavaScriptCore/parser/Parser.cpp:4032 > + bool oldAllowsIn = m_allowsIn; > + m_allowsIn = true; > TreeExpression lhs = parseAssignmentExpression(context); > + m_allowsIn = oldAllowsIn; Looks fine to me, but there are two other things we sometimes use in cases like this: 1) SetForScope, so we don’t need to do the restore explicitly, but requires a scope. 2) std::exchange so we can get and set something at the same time. 1699133 4 411692 ashvayka 2020-10-18 14:04:30 -0700 Comment on attachment 411692 Patch That's a great first patch, Mark! r=me with 2 comments: 1. Let's AllowInOverride instead. 2. Please remove now passing test from JSTests/test262/expectations.yaml. 1699173 5 411722 m 2020-10-18 16:56:58 -0700 Created attachment 411722 Patch 1699174 6 m 2020-10-18 16:58:10 -0700 thanks all for the comments! just uploaded an updated patch. let me know if there's anything else I should address. 1699217 7 411722 ashvayka 2020-10-19 04:54:21 -0700 Comment on attachment 411722 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411722&action=review > Source/JavaScriptCore/parser/Parser.cpp:4029 > + TreeExpression lhs; The final nit: let's avoid calling default constructor by doing `TreeExpression lhs = 0`, which seems like a convention in Parser.cpp. Please re-upload the patch with --no-review, since it was already reviewed, and with --request-commit so a WebKit committer would help you land it. 1699295 8 411758 m 2020-10-19 10:06:31 -0700 Created attachment 411758 Patch 1699297 9 m 2020-10-19 10:06:58 -0700 done and done. thanks! 1699364 10 411758 ashvayka 2020-10-19 12:22:02 -0700 Comment on attachment 411758 Patch Congratulations on your first patch landed! Great job, Mark! 1699365 11 ews-feeder 2020-10-19 12:22:41 -0700 Downloading keyring-7.3.1... Installing keyring-7.3.1... Installed keyring-7.3.1! ChangeLog entry in JSTests/ChangeLog contains OOPS!. 1699368 12 ashvayka 2020-10-19 12:31:02 -0700 (In reply to EWS from comment #11) > ChangeLog entry in JSTests/ChangeLog contains OOPS!. Hmm, I guess reviewer's name is required to be filled manually. 1699369 13 411758 darin 2020-10-19 12:31:45 -0700 Comment on attachment 411758 Patch Lets try that again. 1699370 14 darin 2020-10-19 12:32:33 -0700 I set review+ to try again. It might be the "wrong" reviewer name (mine), but should work. 1699429 15 ews-feeder 2020-10-19 14:14:09 -0700 Committed r268688: <https://trac.webkit.org/changeset/268688> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411758. 1699430 16 webkit-bug-importer 2020-10-19 14:15:19 -0700 <rdar://problem/70455906> 411692 2020-10-17 18:36:24 -0700 2020-10-18 16:56:56 -0700 Patch bug-217879-20201017203623.patch text/plain 4439 m U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4Mzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MjI5MzA5YjZlMDIxMjFhYjVjZWFkOGZmMzY5NDk2NTNmZDFkNzVmLi5jYWViNzRkMTI4OGNkZWVm NWQxMjRkZjA1MThhMmU0ZjkzZjU2MzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0xMC0xNyAgTWFyayBDb2hlbiAgPG1AbXBjLnNoPgorCisgICAgICAg IHRlc3QyNjI6IHRlc3QvbGFuZ3VhZ2UvZXhwcmVzc2lvbnMvY29uZGl0aW9uYWwvaW4tYnJhbmNo LTEuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Nzg3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSB0ZXN0MjYyIHRlc3QgaW4gcXVlc3Rpb24gY2hlY2tzIHRoYXQgdGhlIHBhcnNlciByZXNwZWN0 cyB0aGUgK0luCisgICAgICAgIHBhcmFtZXRlciBvbiB0aGUgbGVmdC1oYW5kIEFzc2lnbm1lbnRF eHByZXNzaW9uIChiZXR3ZWVuIGA/YCBhbmQgYDpgKQorICAgICAgICBpbiB0aGUgdGVybmFyeSBv cGVyYXRvciBncmFtbWFyLiBUaGUgcmVsZXZhbnQgcGllY2Ugb2YgdGhlIHNwZWMgY2FuIGJlCisg ICAgICAgIGZvdW5kIGhlcmUgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNzZWMtY29uZGl0aW9u YWwtb3BlcmF0b3IpLiBUaGUKKyAgICAgICAgdGVzdCBjaGVja3MgdGhpcyBieSBlbWJlZGRpbmcg YSB0ZXJuYXJ5IHdpdGggbGVmdC1oYW5kCisgICAgICAgIEFzc2lnbm1lbnRFeHByZXNzaW9uIHRo YXQgY29udGFpbnMgdGhlIGBpbmAga2V5d29yZCBpbiB0aGUKKyAgICAgICAgaW5pdGlhbGl6aW5n IHN0YXRlbWVudCBvZiBhIGBmb3JgIGxvb3AsIHdoZXJlIGBpbmAgd291bGQgbm9ybWFsbHkgYmUK KyAgICAgICAgZGlzYWxsb3dlZC4gQWxsIHRoaXMgcGF0Y2ggZG9lcyBpcyB1bmNvbmRpdGlvbmFs bHkgYWxsb3cgdGhlIGBpbmAKKyAgICAgICAga2V5d29yZCBpbnNpZGUgdGhlIGxlZnQtaGFuZCBB c3NpZ25tZW50RXhwcmVzc2lvbiBvZiBhIHRlcm5hcnkuCisKKyAgICAgICAgVGhpcyBhbHNvIGZp eGVzIGEgdmFyaWFibGUgdHlwbyBpbiBwYXJzZUZvclN0YXRlbWVudC4KKworICAgICAgICAqIHBh cnNlci9QYXJzZXIuY3BwOgorCiAyMDIwLTEwLTEyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgSklUIG9wZXJhdGlvbnMgZG8gbm90IG5lZWQgZXh0ZXJuICJD IgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDkyN2I4NWE3ZDVh ODI4NTYxZmM2NGFlNzM3OWFjZWIyYzkwYjM1YzguLmQ2MDJiNTE0ZGJmYmVjMWQ4OGUyNDQ3NmQy Y2VhMzcyMDMyMDFhYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAK QEAgLTEzNDMsNyArMTM0Myw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0 YXRlbWVudCBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VGb3JTdGF0ZW1lbnQoCiAgICAgSlNUZXh0 UG9zaXRpb24gZGVjbHNFbmQ7CiAgICAgVHJlZUV4cHJlc3Npb24gZGVjbHMgPSAwOwogICAgIFRy ZWVEZXN0cnVjdHVyaW5nUGF0dGVybiBwYXR0ZXJuID0gMDsKLSAgICBib29sIGlzVmFyRGVjbGFy YXRvbiA9IG1hdGNoKFZBUik7CisgICAgYm9vbCBpc1ZhckRlY2xhcmF0aW9uID0gbWF0Y2goVkFS KTsKICAgICBib29sIGlzTGV0RGVjbGFyYXRpb24gPSBtYXRjaChMRVQpOwogICAgIGJvb2wgaXND b25zdERlY2xhcmF0aW9uID0gbWF0Y2goQ09OU1RUT0tFTik7CiAgICAgYm9vbCBmb3JMb29wQ29u c3REb2VzTm90SGF2ZUluaXRpYWxpemVyID0gZmFsc2U7CkBAIC0xMzY1LDcgKzEzNjUsNyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFyc2VyPExleGVyVHlw ZT46OnBhcnNlRm9yU3RhdGVtZW50KAogICAgICAgICAgICAgcG9wU2NvcGUobGV4aWNhbFNjb3Bl LCBUcmVlQnVpbGRlcjo6TmVlZHNGcmVlVmFyaWFibGVJbmZvKTsKICAgICB9OwogCi0gICAgaWYg KGlzVmFyRGVjbGFyYXRvbiB8fCBpc0xldERlY2xhcmF0aW9uIHx8IGlzQ29uc3REZWNsYXJhdGlv bikgeworICAgIGlmIChpc1ZhckRlY2xhcmF0aW9uIHx8IGlzTGV0RGVjbGFyYXRpb24gfHwgaXND b25zdERlY2xhcmF0aW9uKSB7CiAgICAgICAgIC8qCiAgICAgICAgICBmb3IgKHZhci9sZXQvY29u c3QgSURFTlQgaW4vb2YgZXhwcmVzc2lvbikgc3RhdGVtZW50CiAgICAgICAgICBmb3IgKHZhci9s ZXQvY29uc3QgdmFyRGVjbGFyYXRpb25MaXN0OyBleHByZXNzaW9uT3B0OyBleHByZXNzaW9uT3B0 KQpAQCAtMTM4Myw3ICsxMzgzLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl U3RhdGVtZW50IFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAg SlNUZXh0UG9zaXRpb24gaW5pdFN0YXJ0OwogICAgICAgICBKU1RleHRQb3NpdGlvbiBpbml0RW5k OwogICAgICAgICBEZWNsYXJhdGlvblR5cGUgZGVjbGFyYXRpb25UeXBlOwotICAgICAgICBpZiAo aXNWYXJEZWNsYXJhdG9uKQorICAgICAgICBpZiAoaXNWYXJEZWNsYXJhdGlvbikKICAgICAgICAg ICAgIGRlY2xhcmF0aW9uVHlwZSA9IERlY2xhcmF0aW9uVHlwZTo6VmFyRGVjbGFyYXRpb247CiAg ICAgICAgIGVsc2UgaWYgKGlzTGV0RGVjbGFyYXRpb24pCiAgICAgICAgICAgICBkZWNsYXJhdGlv blR5cGUgPSBEZWNsYXJhdGlvblR5cGU6OkxldERlY2xhcmF0aW9uOwpAQCAtMTQ0Nyw3ICsxNDQ3 LDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjxM ZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAgICAgIHJlc3VsdCA9IGNvbnRl eHQuY3JlYXRlRm9yT2ZMb29wKGlzQXdhaXRGb3IsIGxvY2F0aW9uLCBmb3JJblRhcmdldCwgZXhw ciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJF bmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIEFTU0VSVCghaXNBd2FpdEZvcik7Ci0gICAgICAgICAgICBpZiAoaXNW YXJEZWNsYXJhdG9uICYmIGZvckluSW5pdGlhbGl6ZXIpCisgICAgICAgICAgICBpZiAoaXNWYXJE ZWNsYXJhdGlvbiAmJiBmb3JJbkluaXRpYWxpemVyKQogICAgICAgICAgICAgICAgIHJlc3VsdCA9 IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBkZWNscywgZXhwciwgc3RhdGVtZW50 LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJFbmQsIHN0YXJ0TGlu ZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIHJlc3VsdCA9IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBmb3JJ blRhcmdldCwgZXhwciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9j YXRpb24sIGV4cHJFbmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwpA QCAtNDAyNiw3ICs0MDI2LDEwIEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4 cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ29uZGl0aW9uYWxFCiAgICAgbV9wYXJz ZXJTdGF0ZS5ub25Ucml2aWFsRXhwcmVzc2lvbkNvdW50Kys7CiAgICAgbV9wYXJzZXJTdGF0ZS5u b25MSFNDb3VudCsrOwogICAgIG5leHQoVHJlZUJ1aWxkZXI6OkRvbnRCdWlsZFN0cmluZ3MpOwor ICAgIGJvb2wgb2xkQWxsb3dzSW4gPSBtX2FsbG93c0luOworICAgIG1fYWxsb3dzSW4gPSB0cnVl OwogICAgIFRyZWVFeHByZXNzaW9uIGxocyA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29u dGV4dCk7CisgICAgbV9hbGxvd3NJbiA9IG9sZEFsbG93c0luOwogICAgIGZhaWxJZkZhbHNlKGxo cywgIkNhbm5vdCBwYXJzZSBsZWZ0IGhhbmQgc2lkZSBvZiB0ZXJuYXJ5IG9wZXJhdG9yIik7CiAg ICAgY29udGV4dC5zZXRFbmRPZmZzZXQobGhzLCBtX2xhc3RUb2tlbkVuZFBvc2l0aW9uLm9mZnNl dCk7CiAgICAgY29uc3VtZU9yRmFpbFdpdGhGbGFncyhDT0xPTiwgVHJlZUJ1aWxkZXI6OkRvbnRC dWlsZFN0cmluZ3MsICJFeHBlY3RlZCAnOicgaW4gdGVybmFyeSBvcGVyYXRvciIpOwo= 411722 2020-10-18 16:56:58 -0700 2020-10-19 10:06:29 -0700 Patch bug-217879-20201018185657.patch text/plain 6472 m U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4Mzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MjI5MzA5YjZlMDIxMjFhYjVjZWFkOGZmMzY5NDk2NTNmZDFkNzVmLi5jYWViNzRkMTI4OGNkZWVm NWQxMjRkZjA1MThhMmU0ZjkzZjU2MzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0xMC0xNyAgTWFyayBDb2hlbiAgPG1AbXBjLnNoPgorCisgICAgICAg IHRlc3QyNjI6IHRlc3QvbGFuZ3VhZ2UvZXhwcmVzc2lvbnMvY29uZGl0aW9uYWwvaW4tYnJhbmNo LTEuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Nzg3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSB0ZXN0MjYyIHRlc3QgaW4gcXVlc3Rpb24gY2hlY2tzIHRoYXQgdGhlIHBhcnNlciByZXNwZWN0 cyB0aGUgK0luCisgICAgICAgIHBhcmFtZXRlciBvbiB0aGUgbGVmdC1oYW5kIEFzc2lnbm1lbnRF eHByZXNzaW9uIChiZXR3ZWVuIGA/YCBhbmQgYDpgKQorICAgICAgICBpbiB0aGUgdGVybmFyeSBv cGVyYXRvciBncmFtbWFyLiBUaGUgcmVsZXZhbnQgcGllY2Ugb2YgdGhlIHNwZWMgY2FuIGJlCisg ICAgICAgIGZvdW5kIGhlcmUgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNzZWMtY29uZGl0aW9u YWwtb3BlcmF0b3IpLiBUaGUKKyAgICAgICAgdGVzdCBjaGVja3MgdGhpcyBieSBlbWJlZGRpbmcg YSB0ZXJuYXJ5IHdpdGggbGVmdC1oYW5kCisgICAgICAgIEFzc2lnbm1lbnRFeHByZXNzaW9uIHRo YXQgY29udGFpbnMgdGhlIGBpbmAga2V5d29yZCBpbiB0aGUKKyAgICAgICAgaW5pdGlhbGl6aW5n IHN0YXRlbWVudCBvZiBhIGBmb3JgIGxvb3AsIHdoZXJlIGBpbmAgd291bGQgbm9ybWFsbHkgYmUK KyAgICAgICAgZGlzYWxsb3dlZC4gQWxsIHRoaXMgcGF0Y2ggZG9lcyBpcyB1bmNvbmRpdGlvbmFs bHkgYWxsb3cgdGhlIGBpbmAKKyAgICAgICAga2V5d29yZCBpbnNpZGUgdGhlIGxlZnQtaGFuZCBB c3NpZ25tZW50RXhwcmVzc2lvbiBvZiBhIHRlcm5hcnkuCisKKyAgICAgICAgVGhpcyBhbHNvIGZp eGVzIGEgdmFyaWFibGUgdHlwbyBpbiBwYXJzZUZvclN0YXRlbWVudC4KKworICAgICAgICAqIHBh cnNlci9QYXJzZXIuY3BwOgorCiAyMDIwLTEwLTEyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgSklUIG9wZXJhdGlvbnMgZG8gbm90IG5lZWQgZXh0ZXJuICJD IgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDkyN2I4NWE3ZDVh ODI4NTYxZmM2NGFlNzM3OWFjZWIyYzkwYjM1YzguLjk4YzJlYzE0NDFmOGRlOWNhNGIwMTI1NWFk M2EyZjYxOGM2ODc1NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAK QEAgLTEzNDMsNyArMTM0Myw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0 YXRlbWVudCBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VGb3JTdGF0ZW1lbnQoCiAgICAgSlNUZXh0 UG9zaXRpb24gZGVjbHNFbmQ7CiAgICAgVHJlZUV4cHJlc3Npb24gZGVjbHMgPSAwOwogICAgIFRy ZWVEZXN0cnVjdHVyaW5nUGF0dGVybiBwYXR0ZXJuID0gMDsKLSAgICBib29sIGlzVmFyRGVjbGFy YXRvbiA9IG1hdGNoKFZBUik7CisgICAgYm9vbCBpc1ZhckRlY2xhcmF0aW9uID0gbWF0Y2goVkFS KTsKICAgICBib29sIGlzTGV0RGVjbGFyYXRpb24gPSBtYXRjaChMRVQpOwogICAgIGJvb2wgaXND b25zdERlY2xhcmF0aW9uID0gbWF0Y2goQ09OU1RUT0tFTik7CiAgICAgYm9vbCBmb3JMb29wQ29u c3REb2VzTm90SGF2ZUluaXRpYWxpemVyID0gZmFsc2U7CkBAIC0xMzY1LDcgKzEzNjUsNyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFyc2VyPExleGVyVHlw ZT46OnBhcnNlRm9yU3RhdGVtZW50KAogICAgICAgICAgICAgcG9wU2NvcGUobGV4aWNhbFNjb3Bl LCBUcmVlQnVpbGRlcjo6TmVlZHNGcmVlVmFyaWFibGVJbmZvKTsKICAgICB9OwogCi0gICAgaWYg KGlzVmFyRGVjbGFyYXRvbiB8fCBpc0xldERlY2xhcmF0aW9uIHx8IGlzQ29uc3REZWNsYXJhdGlv bikgeworICAgIGlmIChpc1ZhckRlY2xhcmF0aW9uIHx8IGlzTGV0RGVjbGFyYXRpb24gfHwgaXND b25zdERlY2xhcmF0aW9uKSB7CiAgICAgICAgIC8qCiAgICAgICAgICBmb3IgKHZhci9sZXQvY29u c3QgSURFTlQgaW4vb2YgZXhwcmVzc2lvbikgc3RhdGVtZW50CiAgICAgICAgICBmb3IgKHZhci9s ZXQvY29uc3QgdmFyRGVjbGFyYXRpb25MaXN0OyBleHByZXNzaW9uT3B0OyBleHByZXNzaW9uT3B0 KQpAQCAtMTM4Myw3ICsxMzgzLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl U3RhdGVtZW50IFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAg SlNUZXh0UG9zaXRpb24gaW5pdFN0YXJ0OwogICAgICAgICBKU1RleHRQb3NpdGlvbiBpbml0RW5k OwogICAgICAgICBEZWNsYXJhdGlvblR5cGUgZGVjbGFyYXRpb25UeXBlOwotICAgICAgICBpZiAo aXNWYXJEZWNsYXJhdG9uKQorICAgICAgICBpZiAoaXNWYXJEZWNsYXJhdGlvbikKICAgICAgICAg ICAgIGRlY2xhcmF0aW9uVHlwZSA9IERlY2xhcmF0aW9uVHlwZTo6VmFyRGVjbGFyYXRpb247CiAg ICAgICAgIGVsc2UgaWYgKGlzTGV0RGVjbGFyYXRpb24pCiAgICAgICAgICAgICBkZWNsYXJhdGlv blR5cGUgPSBEZWNsYXJhdGlvblR5cGU6OkxldERlY2xhcmF0aW9uOwpAQCAtMTQ0Nyw3ICsxNDQ3 LDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjxM ZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAgICAgIHJlc3VsdCA9IGNvbnRl eHQuY3JlYXRlRm9yT2ZMb29wKGlzQXdhaXRGb3IsIGxvY2F0aW9uLCBmb3JJblRhcmdldCwgZXhw ciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJF bmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIEFTU0VSVCghaXNBd2FpdEZvcik7Ci0gICAgICAgICAgICBpZiAoaXNW YXJEZWNsYXJhdG9uICYmIGZvckluSW5pdGlhbGl6ZXIpCisgICAgICAgICAgICBpZiAoaXNWYXJE ZWNsYXJhdGlvbiAmJiBmb3JJbkluaXRpYWxpemVyKQogICAgICAgICAgICAgICAgIHJlc3VsdCA9 IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBkZWNscywgZXhwciwgc3RhdGVtZW50 LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJFbmQsIHN0YXJ0TGlu ZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIHJlc3VsdCA9IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBmb3JJ blRhcmdldCwgZXhwciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9j YXRpb24sIGV4cHJFbmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwpA QCAtNDAyNiw3ICs0MDI2LDEyIEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4 cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ29uZGl0aW9uYWxFCiAgICAgbV9wYXJz ZXJTdGF0ZS5ub25Ucml2aWFsRXhwcmVzc2lvbkNvdW50Kys7CiAgICAgbV9wYXJzZXJTdGF0ZS5u b25MSFNDb3VudCsrOwogICAgIG5leHQoVHJlZUJ1aWxkZXI6OkRvbnRCdWlsZFN0cmluZ3MpOwot ICAgIFRyZWVFeHByZXNzaW9uIGxocyA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4 dCk7CisgICAgVHJlZUV4cHJlc3Npb24gbGhzOworICAgIHsKKyAgICAgICAgLy8gdGhpcyBibG9j ayBpcyBuZWNlc3Nhcnkgc28gdGhhdCB3ZSBkb24ndCBsZWF2ZSBgaW5gIGVuYWJsZWQgZm9yIHRo ZSByaHMKKyAgICAgICAgQWxsb3dJbk92ZXJyaWRlIGFsbG93SW5PdmVycmlkZSh0aGlzKTsKKyAg ICAgICAgbGhzID0gcGFyc2VBc3NpZ25tZW50RXhwcmVzc2lvbihjb250ZXh0KTsKKyAgICB9CiAg ICAgZmFpbElmRmFsc2UobGhzLCAiQ2Fubm90IHBhcnNlIGxlZnQgaGFuZCBzaWRlIG9mIHRlcm5h cnkgb3BlcmF0b3IiKTsKICAgICBjb250ZXh0LnNldEVuZE9mZnNldChsaHMsIG1fbGFzdFRva2Vu RW5kUG9zaXRpb24ub2Zmc2V0KTsKICAgICBjb25zdW1lT3JGYWlsV2l0aEZsYWdzKENPTE9OLCBU cmVlQnVpbGRlcjo6RG9udEJ1aWxkU3RyaW5ncywgIkV4cGVjdGVkICc6JyBpbiB0ZXJuYXJ5IG9w ZXJhdG9yIik7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdl TG9nCmluZGV4IDk2N2ViZjJkYTRhZmRhMmZhZDczZDQwNTkzYmFiNDZiYjRlYTAwOWUuLjlmY2Jk NDA4MjcxOThjYjAzYzZkYTc0ZGY3MjY5MDAwNzM2MzQxMTEgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMv Q2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAt MTAtMTcgIE1hcmsgQ29oZW4gIDxtQG1wYy5zaD4KKworICAgICAgICB0ZXN0MjYyOiB0ZXN0L2xh bmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0xLmpzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc4NzkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGZpeGVkIHRoaXMgdGVzdDI2 MiBmYWlsdXJlIC0gc2VlIHRoZSBKU0MgQ2hhbmdlTG9nIGZvciBtb3JlIGRldGFpbHMuCisgICAg ICAgIEFsbCBJJ3ZlIGRvbmUgaW4gdGhpcyBkaXJlY3RvcnkgaXMgcmVtb3ZlIHRoZSBleHBlY3Rl ZCBmYWlsdXJlIGZyb20KKyAgICAgICAgdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbC4KKworICAg ICAgICAqIHRlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWw6CisKIDIwMjAtMTAtMTIgIFNhYW0gQmFy YXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQXJyYXkucHJvdG90eXBlLnNvcnQn cyBzb3J0QnVja2V0U29ydCBhY2Nlc3NlcyBhbiBhcnJheSBpbiBhbiBpbnZhbGlkIHdheSB0aGF0 IGNhbiBsZWFkIHRvIGluY29ycmVjdCByZXN1bHRzIHdpdGggaW5kZXhlZCBwcm9wZXJ0aWVzIG9u IHRoZSBwcm90b3R5cGUgY2hhaW4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3Rh dGlvbnMueWFtbCBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAppbmRleCBmZGRi YWFlYzRjZWFlODEwOTdhOTUyMWI5NGJjNWNjN2VjZWY0NWU0Li5kN2E3NTY3MzQ5ZWU4M2VhYjA1 NDcyZThmNjM1NTQ1NTk0NWMxNmQ0IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0 YXRpb25zLnlhbWwKKysrIGIvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCkBAIC0y NTM3LDkgKzI1MzcsNiBAQCB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbXBvdW5kLWFzc2ln bm1lbnQvUzExLjEzLjJfQTcuOF9UNC5qczoKIHRlc3QvbGFuZ3VhZ2UvZXhwcmVzc2lvbnMvY29t cG91bmQtYXNzaWdubWVudC9TMTEuMTMuMl9BNy45X1Q0LmpzOgogICBkZWZhdWx0OiAnVGVzdDI2 MkVycm9yOiBFeHBlY3RlZCB0cnVlIGJ1dCBnb3QgZmFsc2UnCiAgIHN0cmljdCBtb2RlOiAnVGVz dDI2MkVycm9yOiBFeHBlY3RlZCB0cnVlIGJ1dCBnb3QgZmFsc2UnCi10ZXN0L2xhbmd1YWdlL2V4 cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0xLmpzOgotICBkZWZhdWx0OiAiU3ludGF4 RXJyb3I6IFVuZXhwZWN0ZWQga2V5d29yZCAnaW4nLiBFeHBlY3RlZCAnOicgaW4gdGVybmFyeSBv cGVyYXRvci4iCi0gIHN0cmljdCBtb2RlOiAiU3ludGF4RXJyb3I6IFVuZXhwZWN0ZWQga2V5d29y ZCAnaW4nLiBFeHBlY3RlZCAnOicgaW4gdGVybmFyeSBvcGVyYXRvci4iCiB0ZXN0L2xhbmd1YWdl L2V4cHJlc3Npb25zL2R5bmFtaWMtaW1wb3J0L2NhdGNoL25lc3RlZC1hc3luYy1nZW4tYXdhaXQt ZXZhbC1zY3JpcHQtY29kZS10YXJnZXQuanM6CiAgIG1vZHVsZTogJ1Rlc3QyNjI6QXN5bmNUZXN0 RmFpbHVyZTpUZXN0MjYyRXJyb3I6IFtvYmplY3QgT2JqZWN0XScKIHRlc3QvbGFuZ3VhZ2UvZXhw cmVzc2lvbnMvZHluYW1pYy1pbXBvcnQvY2F0Y2gvbmVzdGVkLWFzeW5jLWdlbi1yZXR1cm4tYXdh aXQtZXZhbC1zY3JpcHQtY29kZS10YXJnZXQuanM6Cg== 411758 2020-10-19 10:06:31 -0700 2020-10-19 14:14:09 -0700 Patch bug-217879-20201019120630.patch text/plain 6476 m U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4Mzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MjI5MzA5YjZlMDIxMjFhYjVjZWFkOGZmMzY5NDk2NTNmZDFkNzVmLi5jYWViNzRkMTI4OGNkZWVm NWQxMjRkZjA1MThhMmU0ZjkzZjU2MzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0xMC0xNyAgTWFyayBDb2hlbiAgPG1AbXBjLnNoPgorCisgICAgICAg IHRlc3QyNjI6IHRlc3QvbGFuZ3VhZ2UvZXhwcmVzc2lvbnMvY29uZGl0aW9uYWwvaW4tYnJhbmNo LTEuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Nzg3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSB0ZXN0MjYyIHRlc3QgaW4gcXVlc3Rpb24gY2hlY2tzIHRoYXQgdGhlIHBhcnNlciByZXNwZWN0 cyB0aGUgK0luCisgICAgICAgIHBhcmFtZXRlciBvbiB0aGUgbGVmdC1oYW5kIEFzc2lnbm1lbnRF eHByZXNzaW9uIChiZXR3ZWVuIGA/YCBhbmQgYDpgKQorICAgICAgICBpbiB0aGUgdGVybmFyeSBv cGVyYXRvciBncmFtbWFyLiBUaGUgcmVsZXZhbnQgcGllY2Ugb2YgdGhlIHNwZWMgY2FuIGJlCisg ICAgICAgIGZvdW5kIGhlcmUgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNzZWMtY29uZGl0aW9u YWwtb3BlcmF0b3IpLiBUaGUKKyAgICAgICAgdGVzdCBjaGVja3MgdGhpcyBieSBlbWJlZGRpbmcg YSB0ZXJuYXJ5IHdpdGggbGVmdC1oYW5kCisgICAgICAgIEFzc2lnbm1lbnRFeHByZXNzaW9uIHRo YXQgY29udGFpbnMgdGhlIGBpbmAga2V5d29yZCBpbiB0aGUKKyAgICAgICAgaW5pdGlhbGl6aW5n IHN0YXRlbWVudCBvZiBhIGBmb3JgIGxvb3AsIHdoZXJlIGBpbmAgd291bGQgbm9ybWFsbHkgYmUK KyAgICAgICAgZGlzYWxsb3dlZC4gQWxsIHRoaXMgcGF0Y2ggZG9lcyBpcyB1bmNvbmRpdGlvbmFs bHkgYWxsb3cgdGhlIGBpbmAKKyAgICAgICAga2V5d29yZCBpbnNpZGUgdGhlIGxlZnQtaGFuZCBB c3NpZ25tZW50RXhwcmVzc2lvbiBvZiBhIHRlcm5hcnkuCisKKyAgICAgICAgVGhpcyBhbHNvIGZp eGVzIGEgdmFyaWFibGUgdHlwbyBpbiBwYXJzZUZvclN0YXRlbWVudC4KKworICAgICAgICAqIHBh cnNlci9QYXJzZXIuY3BwOgorCiAyMDIwLTEwLTEyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgSklUIG9wZXJhdGlvbnMgZG8gbm90IG5lZWQgZXh0ZXJuICJD IgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDkyN2I4NWE3ZDVh ODI4NTYxZmM2NGFlNzM3OWFjZWIyYzkwYjM1YzguLmUxOTBlNjkzNjk5NTdhNGQwMGNiYzZiNzNj N2NmMDEwOWM1OWUxYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAK QEAgLTEzNDMsNyArMTM0Myw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0 YXRlbWVudCBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VGb3JTdGF0ZW1lbnQoCiAgICAgSlNUZXh0 UG9zaXRpb24gZGVjbHNFbmQ7CiAgICAgVHJlZUV4cHJlc3Npb24gZGVjbHMgPSAwOwogICAgIFRy ZWVEZXN0cnVjdHVyaW5nUGF0dGVybiBwYXR0ZXJuID0gMDsKLSAgICBib29sIGlzVmFyRGVjbGFy YXRvbiA9IG1hdGNoKFZBUik7CisgICAgYm9vbCBpc1ZhckRlY2xhcmF0aW9uID0gbWF0Y2goVkFS KTsKICAgICBib29sIGlzTGV0RGVjbGFyYXRpb24gPSBtYXRjaChMRVQpOwogICAgIGJvb2wgaXND b25zdERlY2xhcmF0aW9uID0gbWF0Y2goQ09OU1RUT0tFTik7CiAgICAgYm9vbCBmb3JMb29wQ29u c3REb2VzTm90SGF2ZUluaXRpYWxpemVyID0gZmFsc2U7CkBAIC0xMzY1LDcgKzEzNjUsNyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFyc2VyPExleGVyVHlw ZT46OnBhcnNlRm9yU3RhdGVtZW50KAogICAgICAgICAgICAgcG9wU2NvcGUobGV4aWNhbFNjb3Bl LCBUcmVlQnVpbGRlcjo6TmVlZHNGcmVlVmFyaWFibGVJbmZvKTsKICAgICB9OwogCi0gICAgaWYg KGlzVmFyRGVjbGFyYXRvbiB8fCBpc0xldERlY2xhcmF0aW9uIHx8IGlzQ29uc3REZWNsYXJhdGlv bikgeworICAgIGlmIChpc1ZhckRlY2xhcmF0aW9uIHx8IGlzTGV0RGVjbGFyYXRpb24gfHwgaXND b25zdERlY2xhcmF0aW9uKSB7CiAgICAgICAgIC8qCiAgICAgICAgICBmb3IgKHZhci9sZXQvY29u c3QgSURFTlQgaW4vb2YgZXhwcmVzc2lvbikgc3RhdGVtZW50CiAgICAgICAgICBmb3IgKHZhci9s ZXQvY29uc3QgdmFyRGVjbGFyYXRpb25MaXN0OyBleHByZXNzaW9uT3B0OyBleHByZXNzaW9uT3B0 KQpAQCAtMTM4Myw3ICsxMzgzLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl U3RhdGVtZW50IFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAg SlNUZXh0UG9zaXRpb24gaW5pdFN0YXJ0OwogICAgICAgICBKU1RleHRQb3NpdGlvbiBpbml0RW5k OwogICAgICAgICBEZWNsYXJhdGlvblR5cGUgZGVjbGFyYXRpb25UeXBlOwotICAgICAgICBpZiAo aXNWYXJEZWNsYXJhdG9uKQorICAgICAgICBpZiAoaXNWYXJEZWNsYXJhdGlvbikKICAgICAgICAg ICAgIGRlY2xhcmF0aW9uVHlwZSA9IERlY2xhcmF0aW9uVHlwZTo6VmFyRGVjbGFyYXRpb247CiAg ICAgICAgIGVsc2UgaWYgKGlzTGV0RGVjbGFyYXRpb24pCiAgICAgICAgICAgICBkZWNsYXJhdGlv blR5cGUgPSBEZWNsYXJhdGlvblR5cGU6OkxldERlY2xhcmF0aW9uOwpAQCAtMTQ0Nyw3ICsxNDQ3 LDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjxM ZXhlclR5cGU+OjpwYXJzZUZvclN0YXRlbWVudCgKICAgICAgICAgICAgIHJlc3VsdCA9IGNvbnRl eHQuY3JlYXRlRm9yT2ZMb29wKGlzQXdhaXRGb3IsIGxvY2F0aW9uLCBmb3JJblRhcmdldCwgZXhw ciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJF bmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIEFTU0VSVCghaXNBd2FpdEZvcik7Ci0gICAgICAgICAgICBpZiAoaXNW YXJEZWNsYXJhdG9uICYmIGZvckluSW5pdGlhbGl6ZXIpCisgICAgICAgICAgICBpZiAoaXNWYXJE ZWNsYXJhdGlvbiAmJiBmb3JJbkluaXRpYWxpemVyKQogICAgICAgICAgICAgICAgIHJlc3VsdCA9 IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBkZWNscywgZXhwciwgc3RhdGVtZW50 LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9jYXRpb24sIGV4cHJFbmQsIHN0YXJ0TGlu ZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIHJlc3VsdCA9IGNvbnRleHQuY3JlYXRlRm9ySW5Mb29wKGxvY2F0aW9uLCBmb3JJ blRhcmdldCwgZXhwciwgc3RhdGVtZW50LCBkZWNsTG9jYXRpb24sIGRlY2xzU3RhcnQsIGluTG9j YXRpb24sIGV4cHJFbmQsIHN0YXJ0TGluZSwgZW5kTGluZSwgKmxleGljYWxWYXJpYWJsZXMpOwpA QCAtNDAyNiw3ICs0MDI2LDEyIEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4 cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ29uZGl0aW9uYWxFCiAgICAgbV9wYXJz ZXJTdGF0ZS5ub25Ucml2aWFsRXhwcmVzc2lvbkNvdW50Kys7CiAgICAgbV9wYXJzZXJTdGF0ZS5u b25MSFNDb3VudCsrOwogICAgIG5leHQoVHJlZUJ1aWxkZXI6OkRvbnRCdWlsZFN0cmluZ3MpOwot ICAgIFRyZWVFeHByZXNzaW9uIGxocyA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4 dCk7CisgICAgVHJlZUV4cHJlc3Npb24gbGhzID0gMDsKKyAgICB7CisgICAgICAgIC8vIHRoaXMg YmxvY2sgaXMgbmVjZXNzYXJ5IHNvIHRoYXQgd2UgZG9uJ3QgbGVhdmUgYGluYCBlbmFibGVkIGZv ciB0aGUgcmhzCisgICAgICAgIEFsbG93SW5PdmVycmlkZSBhbGxvd0luT3ZlcnJpZGUodGhpcyk7 CisgICAgICAgIGxocyA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CisgICAg fQogICAgIGZhaWxJZkZhbHNlKGxocywgIkNhbm5vdCBwYXJzZSBsZWZ0IGhhbmQgc2lkZSBvZiB0 ZXJuYXJ5IG9wZXJhdG9yIik7CiAgICAgY29udGV4dC5zZXRFbmRPZmZzZXQobGhzLCBtX2xhc3RU b2tlbkVuZFBvc2l0aW9uLm9mZnNldCk7CiAgICAgY29uc3VtZU9yRmFpbFdpdGhGbGFncyhDT0xP TiwgVHJlZUJ1aWxkZXI6OkRvbnRCdWlsZFN0cmluZ3MsICJFeHBlY3RlZCAnOicgaW4gdGVybmFy eSBvcGVyYXRvciIpOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0No YW5nZUxvZwppbmRleCA5NjdlYmYyZGE0YWZkYTJmYWQ3M2Q0MDU5M2JhYjQ2YmI0ZWEwMDllLi45 ZmNiZDQwODI3MTk4Y2IwM2M2ZGE3NGRmNzI2OTAwMDczNjM0MTExIDEwMDY0NAotLS0gYS9KU1Rl c3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDIwLTEwLTE3ICBNYXJrIENvaGVuICA8bUBtcGMuc2g+CisKKyAgICAgICAgdGVzdDI2MjogdGVz dC9sYW5ndWFnZS9leHByZXNzaW9ucy9jb25kaXRpb25hbC9pbi1icmFuY2gtMS5qcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3ODc5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBmaXhlZCB0aGlzIHRl c3QyNjIgZmFpbHVyZSAtIHNlZSB0aGUgSlNDIENoYW5nZUxvZyBmb3IgbW9yZSBkZXRhaWxzLgor ICAgICAgICBBbGwgSSd2ZSBkb25lIGluIHRoaXMgZGlyZWN0b3J5IGlzIHJlbW92ZSB0aGUgZXhw ZWN0ZWQgZmFpbHVyZSBmcm9tCisgICAgICAgIHRlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwuCisK KyAgICAgICAgKiB0ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sOgorCiAyMDIwLTEwLTEyICBTYWFt IEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIEFycmF5LnByb3RvdHlwZS5z b3J0J3Mgc29ydEJ1Y2tldFNvcnQgYWNjZXNzZXMgYW4gYXJyYXkgaW4gYW4gaW52YWxpZCB3YXkg dGhhdCBjYW4gbGVhZCB0byBpbmNvcnJlY3QgcmVzdWx0cyB3aXRoIGluZGV4ZWQgcHJvcGVydGll cyBvbiB0aGUgcHJvdG90eXBlIGNoYWluCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3Rlc3QyNjIvZXhw ZWN0YXRpb25zLnlhbWwgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKaW5kZXgg ZmRkYmFhZWM0Y2VhZTgxMDk3YTk1MjFiOTRiYzVjYzdlY2VmNDVlNC4uZDdhNzU2NzM0OWVlODNl YWIwNTQ3MmU4ZjYzNTU0NTU5NDVjMTZkNCAxMDA2NDQKLS0tIGEvSlNUZXN0cy90ZXN0MjYyL2V4 cGVjdGF0aW9ucy55YW1sCisrKyBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbApA QCAtMjUzNyw5ICsyNTM3LDYgQEAgdGVzdC9sYW5ndWFnZS9leHByZXNzaW9ucy9jb21wb3VuZC1h c3NpZ25tZW50L1MxMS4xMy4yX0E3LjhfVDQuanM6CiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25z L2NvbXBvdW5kLWFzc2lnbm1lbnQvUzExLjEzLjJfQTcuOV9UNC5qczoKICAgZGVmYXVsdDogJ1Rl c3QyNjJFcnJvcjogRXhwZWN0ZWQgdHJ1ZSBidXQgZ290IGZhbHNlJwogICBzdHJpY3QgbW9kZTog J1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgdHJ1ZSBidXQgZ290IGZhbHNlJwotdGVzdC9sYW5ndWFn ZS9leHByZXNzaW9ucy9jb25kaXRpb25hbC9pbi1icmFuY2gtMS5qczoKLSAgZGVmYXVsdDogIlN5 bnRheEVycm9yOiBVbmV4cGVjdGVkIGtleXdvcmQgJ2luJy4gRXhwZWN0ZWQgJzonIGluIHRlcm5h cnkgb3BlcmF0b3IuIgotICBzdHJpY3QgbW9kZTogIlN5bnRheEVycm9yOiBVbmV4cGVjdGVkIGtl eXdvcmQgJ2luJy4gRXhwZWN0ZWQgJzonIGluIHRlcm5hcnkgb3BlcmF0b3IuIgogdGVzdC9sYW5n dWFnZS9leHByZXNzaW9ucy9keW5hbWljLWltcG9ydC9jYXRjaC9uZXN0ZWQtYXN5bmMtZ2VuLWF3 YWl0LWV2YWwtc2NyaXB0LWNvZGUtdGFyZ2V0LmpzOgogICBtb2R1bGU6ICdUZXN0MjYyOkFzeW5j VGVzdEZhaWx1cmU6VGVzdDI2MkVycm9yOiBbb2JqZWN0IE9iamVjdF0nCiB0ZXN0L2xhbmd1YWdl L2V4cHJlc3Npb25zL2R5bmFtaWMtaW1wb3J0L2NhdGNoL25lc3RlZC1hc3luYy1nZW4tcmV0dXJu LWF3YWl0LWV2YWwtc2NyaXB0LWNvZGUtdGFyZ2V0LmpzOgo=