226790 2021-06-08 16:53:46 -0700 Nullopt in RenderFlexibleBox::computeInnerFlexBaseSizeForChild via RenderFlexibleBox::layoutFlexItems 2021-06-10 16:59:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226367 InRadar P2 Normal --- 1 rniwa rbuis bfulgham cgarcia ews-feeder fred.wang gpoo koivisto product-security rbuis simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1767961 0 430911 rniwa 2021-06-08 16:53:46 -0700 Created attachment 430911 Test e.g. Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 1 libsystem_pthread.dylib 0x00007fff20686615 pthread_kill + 263 2 libsystem_c.dylib 0x00007fff205db411 abort + 120 3 com.apple.WebCore 0x0000000270044229 std::__1::__throw_bad_optional_access() + 9 (optional:193) 4 com.apple.WebCore 0x0000000271a97cbd std::__1::optional<WebCore::LayoutUnit>::value() && + 5 (optional:965) [inlined] 5 com.apple.WebCore 0x0000000271a97cbd WebCore::RenderFlexibleBox::computeInnerFlexBaseSizeForChild(WebCore::RenderBox&, WebCore::LayoutUnit) + 813 (RenderFlexibleBox.cpp:948) 6 com.apple.WebCore 0x0000000271a983d6 WebCore::RenderFlexibleBox::constructFlexItem(WebCore::RenderBox&, bool) + 422 (RenderFlexibleBox.cpp:1335) 7 com.apple.WebCore 0x0000000271a944c2 WebCore::RenderFlexibleBox::layoutFlexItems(bool) + 274 (RenderFlexibleBox.cpp:990) 8 com.apple.WebCore 0x0000000271a94013 WebCore::RenderFlexibleBox::layoutBlock(bool, WebCore::LayoutUnit) + 851 (RenderFlexibleBox.cpp:307) 9 com.apple.WebCore 0x0000000271a1e2da WebCore::RenderBlock::layout() + 42 (RenderBlock.cpp:596) 10 com.apple.WebCore 0x0000000271a3f496 WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 982 (RenderBlockFlow.cpp:764) 11 com.apple.WebCore 0x0000000271a3dc78 WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 632 (RenderBlockFlow.cpp:675) 12 com.apple.WebCore 0x0000000271a3cc90 WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit) + 976 (RenderBlockFlow.cpp:527) 13 com.apple.WebCore 0x0000000271a1e2da WebCore::RenderBlock::layout() + 42 (RenderBlock.cpp:596) 14 com.apple.WebCore 0x0000000271a3f496 WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 982 (RenderBlockFlow.cpp:764) 15 com.apple.WebCore 0x0000000271a3dc78 WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 632 (RenderBlockFlow.cpp:675) 16 com.apple.WebCore 0x0000000271a3cc90 WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit) + 976 (RenderBlockFlow.cpp:527) 17 com.apple.WebCore 0x0000000271a1e2da WebCore::RenderBlock::layout() + 42 (RenderBlock.cpp:596) 18 com.apple.WebCore 0x0000000271b80e93 WebCore::RenderView::layout() + 611 (RenderView.cpp:185) 19 com.apple.WebCore 0x00000002716c45f9 WebCore::FrameViewLayoutContext::layout() + 953 (FrameViewLayoutContext.cpp:233) 20 com.apple.WebCore 0x00000002710caea1 WebCore::Document::implicitClose() + 849 (Document.cpp:3188) 21 com.apple.WebCore 0x00000002715dc367 WebCore::FrameLoader::checkCompleted() + 391 (FrameLoader.cpp:881) 22 com.apple.WebCore 0x00000002715dace3 WebCore::FrameLoader::finishedParsing() + 115 (FrameLoader.cpp:786) 23 com.apple.WebCore 0x00000002710dacf0 WebCore::Document::finishedParsing() + 368 (Document.cpp:6061) 24 com.apple.WebCore 0x000000027141ab66 WebCore::HTMLDocumentParser::end() + 12 (HTMLDocumentParser.cpp:449) [inlined] 25 com.apple.WebCore 0x000000027141ab66 WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd() + 33 (HTMLDocumentParser.cpp:458) [inlined] 26 com.apple.WebCore 0x000000027141ab66 WebCore::HTMLDocumentParser::prepareToStopParsing() + 246 (HTMLDocumentParser.cpp:152) 27 com.apple.WebCore 0x000000027141c172 WebCore::HTMLDocumentParser::finish() + 114 (HTMLDocumentParser.cpp:498) 28 com.apple.WebCore 0x00000002715b80dc WebCore::DocumentWriter::end() + 76 (DocumentWriter.cpp:294) 29 com.apple.WebCore 0x00000002715b70c6 WebCore::DocumentLoader::finishedLoading() + 390 (DocumentLoader.cpp:488) <rdar://78762842> 1767972 1 rniwa 2021-06-08 17:07:34 -0700 Reproduced with non-ASAN release build of WebKitTestRunner at r278627. 1768065 2 430943 rbuis 2021-06-08 23:46:18 -0700 Created attachment 430943 Patch 1768101 3 430943 svillar 2021-06-09 01:31:37 -0700 Comment on attachment 430943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430943&action=review > Source/WebCore/ChangeLog:9 > + childMainSizeIsDefinite. One line is OK. > Source/WebCore/rendering/RenderFlexibleBox.cpp:867 > + if (flexBasis.type() == LengthType::Intrinsic) I think we should change this to check isLegacyIntrinsic() and then add the proper test case for min-intrinsic, because I'b bet it'll crash the same way. > LayoutTests/ChangeLog:12 > + * fast/css/flex-box-intrinsic-width-crash.html: There is fast/flexbox, could you move the test there? > LayoutTests/fast/css/flex-box-intrinsic-width-column-flow-crash.html:1 > +<script> Can we add a <!DOCTYPE html> ? > LayoutTests/fast/css/flex-box-intrinsic-width-crash.html:14 > +<body> Do we need <body> here? 1768140 4 430953 rbuis 2021-06-09 05:01:19 -0700 Created attachment 430953 Patch 1768187 5 430943 rbuis 2021-06-09 08:21:12 -0700 Comment on attachment 430943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430943&action=review >> Source/WebCore/ChangeLog:9 >> + childMainSizeIsDefinite. > > One line is OK. Done. >> Source/WebCore/rendering/RenderFlexibleBox.cpp:867 >> + if (flexBasis.type() == LengthType::Intrinsic) > > I think we should change this to check isLegacyIntrinsic() and then add the proper test case for min-intrinsic, because I'b bet it'll crash the same way. Actually for min-intrinsic there is no crash. >> LayoutTests/ChangeLog:12 >> + * fast/css/flex-box-intrinsic-width-crash.html: > > There is fast/flexbox, could you move the test there? Done. >> LayoutTests/fast/css/flex-box-intrinsic-width-column-flow-crash.html:1 >> +<script> > > Can we add a <!DOCTYPE html> ? Done. >> LayoutTests/fast/css/flex-box-intrinsic-width-crash.html:14 >> +<body> > > Do we need <body> here? It is needed to cause the crash, yes. 1768242 6 430943 rbuis 2021-06-09 11:07:24 -0700 Comment on attachment 430943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430943&action=review >>> Source/WebCore/rendering/RenderFlexibleBox.cpp:867 >>> + if (flexBasis.type() == LengthType::Intrinsic) >> >> I think we should change this to check isLegacyIntrinsic() and then add the proper test case for min-intrinsic, because I'b bet it'll crash the same way. > > Actually for min-intrinsic there is no crash. I looked a bit more into it. For both intrinsic and min-intrinsic computeInnerFlexBaseSizeForChild calls computeMainAxisExtentForChild. In this test case this ends up calling child.computeContentLogicalHeight (because of !mainAxisIsChildInlineAxis) check. Then computeContentLogicalHeight, or rather computeContentAndScrollbarLogicalHeightUsing, acts differently for these two. For min-intrinsic computeIntrinsicLogicalContentHeightUsing is called but for intrinsic std::nullopt is returned, causing the crash later when we call value() on the returned value. Because we use computeIntrinsicLogicalContentHeightUsing, we pass an intrinsic height, so the min-intrinsic will resolve against that and return some non-null value, avoiding the crash. 1768489 7 svillar 2021-06-10 02:36:40 -0700 (In reply to Rob Buis from comment #6) > Comment on attachment 430943 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=430943&action=review > > >>> Source/WebCore/rendering/RenderFlexibleBox.cpp:867 > >>> + if (flexBasis.type() == LengthType::Intrinsic) > >> > >> I think we should change this to check isLegacyIntrinsic() and then add the proper test case for min-intrinsic, because I'b bet it'll crash the same way. > > > > Actually for min-intrinsic there is no crash. > > I looked a bit more into it. For both intrinsic and min-intrinsic > computeInnerFlexBaseSizeForChild calls computeMainAxisExtentForChild. In > this test case this ends up calling child.computeContentLogicalHeight > (because of !mainAxisIsChildInlineAxis) check. Then > computeContentLogicalHeight, or rather > computeContentAndScrollbarLogicalHeightUsing, acts differently for these > two. For min-intrinsic computeIntrinsicLogicalContentHeightUsing is called > but for intrinsic std::nullopt is returned, causing the crash later when we > call value() on the returned value. Because we use > computeIntrinsicLogicalContentHeightUsing, we pass an intrinsic height, so > the min-intrinsic will resolve against that and return some non-null value, > avoiding the crash. Right, IIRC you added a patch recently that was making computeIntrinsicLogicalContentHeightUsing() treat minintrinsic as the other content sized cases. I wonder why we don't do the same here. I guess you could replace that check by isLegacyIntrinsic() in RenderBox and then you could use it as well in RenderFlexibleBox. 1768524 8 431067 rbuis 2021-06-10 06:15:52 -0700 Created attachment 431067 Patch 1768558 9 431067 svillar 2021-06-10 08:30:06 -0700 Comment on attachment 431067 Patch Looks good provided the EWS are happy 1768579 10 ews-feeder 2021-06-10 09:41:15 -0700 Committed r278705 (238676@main): <https://commits.webkit.org/238676@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431067. 430911 2021-06-08 16:53:46 -0700 2021-06-08 16:53:46 -0700 Test repro_667.html text/html 123 rniwa PHN0eWxlPgogIHN0eWxlLCBoZWFkIHsKICAgIGRpc3BsYXk6IGZsZXg7CiAgfQogIHN0eWxlIHsK ICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7CiAgICB3aWR0aDogaW50cmluc2ljOwogIH0K PC9zdHlsZT4K 430943 2021-06-08 23:46:18 -0700 2021-06-09 05:01:09 -0700 Patch bug-226790-20210609084616.patch text/plain 4355 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YzOGEzNTBkOTdlODM0 OWJmZGM1YWVjMjgxYWI4YmFjNjQ1YTU0ZS4uYzRlZTIxYWFmODRjODliNDliMzJlYjZmMWViNTRl MDQzZWI1YWY3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgd2lkdGg6IGludHJpbnNp YyBhcyBub24gZGVmaW5pdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNjc5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRyZWF0IHdpZHRoOiBpbnRyaW5zaWMgYXMgbm9uIGRlZmluaXRlIGluCisgICAg ICAgIGNoaWxkTWFpblNpemVJc0RlZmluaXRlLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3NzL2Zs ZXgtYm94LWludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1jcmFzaC5odG1sCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKToKKwogMjAyMS0wNi0wNyAg QWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJl YW1lcl0gQWRkIGNsYW5nIFRTQSBhbm5vdGF0aW9uczogTWFpblRocmVhZE5vdGlmaWVyCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBjOWRm YmRjYzJlZjg2MDU1MzQ2MTM2MjM1ZmQ2YThhMGVhYWRiNTNiLi4yZDQyYzYwMjcxN2ZiZTFlMDNk MmI3MzExMWYyM2E1Mjg1NWQwMTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTg2NCw3ICs4NjQsOSBAQCBib29sIFJlbmRlckZsZXhp YmxlQm94OjpjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBj b25zdCBMZQogewogICAgIGlmIChmbGV4QmFzaXMuaXNBdXRvKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBpZiAoaXNDb2x1bW5GbG93KCkgJiYgKGZsZXhCYXNpcy5pc0ludHJpbnNpYygp IHx8IGZsZXhCYXNpcy50eXBlKCkgPT0gTGVuZ3RoVHlwZTo6SW50cmluc2ljKSkKKyAgICBpZiAo ZmxleEJhc2lzLnR5cGUoKSA9PSBMZW5ndGhUeXBlOjpJbnRyaW5zaWMpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoaXNDb2x1bW5GbG93KCkgJiYgZmxleEJhc2lzLmlzSW50cmluc2lj KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoZmxleEJhc2lzLmlzUGVyY2VudE9y Q2FsY3VsYXRlZCgpKQogICAgICAgICByZXR1cm4gY2FuQ29tcHV0ZVBlcmNlbnRhZ2VGbGV4QmFz aXMoY2hpbGQsIGZsZXhCYXNpcywgVXBkYXRlUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzOjpO byk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggN2M3YjgzNzkwY2YzYmZhYzU3OTEwNWM2Yzk4MzNhNzhmMWE2YTM0MC4uNDkx ZTU5Zjk2YjMzYmEwYTMwZWU4YjE2MGIwODM2NDM4MDE2NTE1YSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA2LTA4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg VHJlYXQgd2lkdGg6IGludHJpbnNpYyBhcyBub24gZGVmaW5pdGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjc5MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgorCisgICAg ICAgICogZmFzdC9jc3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNo LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvZmxleC1ib3gtaW50cmlu c2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWw6IENvcGllZCBmcm9tIExheW91dFRlc3Rz L2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jcmFzaC5odG1sLgorICAgICAgICAq IGZhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jcmFzaC5odG1sOgorCiAyMDIxLTA2 LTA3ICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T XSBVbmV4cGVjdGVkIHNjcm9sbGluZyB3aGVuIHN3aXRjaGluZyBmb2N1cyBmcm9tIGEgdGV4dCBp bnB1dCB0byBhIHNlbGVjdCBlbGVtZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY29sdW1uLWZsb3ctY3Jhc2gtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNvbHVtbi1m bG93LWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iZmE1OTM2ZmQwMGNlZGFlNjNjMTQy MzAzZmVhODE1ZTQ0NDIzNzJlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxIEBACitQYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCEKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxv dy1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxleC1ib3gtaW50cmluc2ljLXdp ZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2RjYmUzZGI0ZDM0NWYwMWE1 ZmVhOWJkZDg0YjhkNmE0YzRjMGUzMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1jcmFzaC5odG1sCkBA IC0wLDAgKzEsMTMgQEAKKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVz dFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KKyAgaHRtbCwgYm9keSB7 CisgICAgZmxleC1mbG93OiBjb2x1bW47CisgICAgd2lkdGg6IGludHJpbnNpYzsKKyAgICB3cml0 aW5nLW1vZGU6IHZlcnRpY2FsLXJsOworICAgIGRpc3BsYXk6IGZsZXg7CisgIH0KKzwvc3R5bGU+ CitQYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwKaW5kZXggM2RjYmUz ZGI0ZDM0NWYwMWE1ZmVhOWJkZDg0YjhkNmE0YzRjMGUzMS4uNTEwNjMzZTEwMGZhNGJiNjk1ZWFk ZTEwZWU5MGJmMjJjOThiMzEyZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxl eC1ib3gtaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwKQEAgLTMsMTEgKzMsMTQgQEAg aWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwogPC9z Y3JpcHQ+CiA8c3R5bGU+Ci0gIGh0bWwsIGJvZHkgewotICAgIGZsZXgtZmxvdzogY29sdW1uOwot ICAgIHdpZHRoOiBpbnRyaW5zaWM7Ci0gICAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsKKyAg cCwgYm9keSB7CiAgICAgZGlzcGxheTogZmxleDsKICAgfQorICBwIHsKKyAgICB3cml0aW5nLW1v ZGU6IHZlcnRpY2FsLXJsOworICAgIHdpZHRoOiBpbnRyaW5zaWM7CisgIH0KIDwvc3R5bGU+Ci1Q YXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCEKKzxib2R5PgorPHA+UGFzc2VzIGlmIGl0IGRvZXNu J3QgY3Jhc2ghPC9wPgorPC9ib2R5Pgo= 430953 2021-06-09 05:01:19 -0700 2021-06-10 06:15:46 -0700 Patch bug-226790-20210609140114.patch text/plain 5848 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZmZTUwMWU3NjRhYTU4 ODBlOGUzMTUzYzkyNmJhMDZjMTkxYjE1OS4uMmMzYzRlMTlkZTc1YTQ3N2VkZTM1M2Y0ODUyYjY5 NmQ1NWMzMzUxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgd2lkdGg6IGludHJpbnNp YyBhcyBub24gZGVmaW5pdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNjc5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRyZWF0IHdpZHRoOiBpbnRyaW5zaWMgYXMgbm9uIGRlZmluaXRlIGluIGNoaWxk TWFpblNpemVJc0RlZmluaXRlLgorCisgICAgICAgIFRlc3RzOiBmYXN0L2ZsZXhib3gvaW50cmlu c2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvZmxl eGJveC9pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 OjpjaGlsZE1haW5TaXplSXNEZWZpbml0ZSk6CisKIDIwMjEtMDYtMDkgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWx5IG9uIFNRTGl0ZURhdGFiYXNlOjpzZXRN YXhpbXVtU2l6ZSgpIGZvciBxdW90YSBtYW5hZ2VtZW50IGluIExvY2FsU3RvcmFnZURhdGFiYXNl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRl eCBjOWRmYmRjYzJlZjg2MDU1MzQ2MTM2MjM1ZmQ2YThhMGVhYWRiNTNiLi4yZDQyYzYwMjcxN2Zi ZTFlMDNkMmI3MzExMWYyM2E1Mjg1NWQwMTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTg2NCw3ICs4NjQsOSBAQCBib29sIFJlbmRl ckZsZXhpYmxlQm94OjpjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNo aWxkLCBjb25zdCBMZQogewogICAgIGlmIChmbGV4QmFzaXMuaXNBdXRvKCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICBpZiAoaXNDb2x1bW5GbG93KCkgJiYgKGZsZXhCYXNpcy5pc0ludHJp bnNpYygpIHx8IGZsZXhCYXNpcy50eXBlKCkgPT0gTGVuZ3RoVHlwZTo6SW50cmluc2ljKSkKKyAg ICBpZiAoZmxleEJhc2lzLnR5cGUoKSA9PSBMZW5ndGhUeXBlOjpJbnRyaW5zaWMpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAoaXNDb2x1bW5GbG93KCkgJiYgZmxleEJhc2lzLmlzSW50 cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoZmxleEJhc2lzLmlzUGVy Y2VudE9yQ2FsY3VsYXRlZCgpKQogICAgICAgICByZXR1cm4gY2FuQ29tcHV0ZVBlcmNlbnRhZ2VG bGV4QmFzaXMoY2hpbGQsIGZsZXhCYXNpcywgVXBkYXRlUGVyY2VudGFnZUhlaWdodERlc2NlbmRh bnRzOjpObyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggZmFhM2E5YjZjNDFlZmJkOGVjYjhmMWU1MmRmN2ZjZGM3ODE5MDdm My4uMjM5NmM4NjExMWFlYzVjMjFkOWViYWYxYjE1NmNlNDk5YzE5Yzc0ZCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDIxLTA2LTA5ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgVHJlYXQgd2lkdGg6IGludHJpbnNpYyBhcyBub24gZGVmaW5pdGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjc5MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgor CisgICAgICAgICogZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1jcmFz aC1leHBlY3RlZC50eHQ6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94 LWludHJpbnNpYy13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQuCisgICAgICAgICogZmFzdC9mbGV4 Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1jcmFzaC5odG1sOiBDb3BpZWQgZnJvbSBM YXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRtbC4K KyAgICAgICAgKiBmYXN0L2ZsZXhib3gvaW50cmluc2ljLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4 dDogUmVuYW1lZCBmcm9tIExheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13 aWR0aC1jcmFzaC1leHBlY3RlZC50eHQuCisgICAgICAgICogZmFzdC9mbGV4Ym94L2ludHJpbnNp Yy13aWR0aC1jcmFzaC5odG1sOiBSZW5hbWVkIGZyb20gTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxl eC1ib3gtaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwuCisKIDIwMjEtMDYtMDkgIERpZWdvIFBp bm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl1bR1RLXSBVbnJl dmlld2VkIHRlc3QgZ2FyZGVuaW5nLiBNYXJrIGZsYWtleSB0ZXN0cyBhcyB0aW1lb3V0IG9ubHku CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lk dGgtY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxleC1ib3gtaW50 cmluc2ljLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggYmZhNTkzNmZkMDBjZWRhZTYzYzE0MjMwM2ZlYTgxNWU0NDQyMzcyZS4uMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0CisrKyAvZGV2L251 bGwKQEAgLTEgKzAsMCBAQAotUGFzc2VzIGlmIGl0IGRvZXNuJ3QgY3Jhc2ghCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jcmFzaC5o dG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzZGNiZTNkYjRkMzQ1ZjAxYTVmZWE5 YmRkODRiOGQ2YTRjNGMwZTMxLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwCi0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1j cmFzaC5odG1sCisrKyAvZGV2L251bGwKQEAgLTEsMTMgKzAsMCBAQAotPHNjcmlwdD4KLWlmICh3 aW5kb3cudGVzdFJ1bm5lcikKLSAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKLTwvc2NyaXB0 PgotPHN0eWxlPgotICBodG1sLCBib2R5IHsKLSAgICBmbGV4LWZsb3c6IGNvbHVtbjsKLSAgICB3 aWR0aDogaW50cmluc2ljOwotICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7Ci0gICAgZGlz cGxheTogZmxleDsKLSAgfQotPC9zdHlsZT4KLVBhc3NlcyBpZiBpdCBkb2Vzbid0IGNyYXNoIQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1 bW4tZmxvdy1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50 cmluc2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5i ZmE1OTM2ZmQwMGNlZGFlNjNjMTQyMzAzZmVhODE1ZTQ0NDIzNzJlCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1j cmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorUGFzc2VzIGlmIGl0IGRvZXNuJ3QgY3Jh c2ghCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50cmluc2ljLXdpZHRo LWNvbHVtbi1mbG93LWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50cmlu c2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDBhNjU4MGYxYzZi ZjQ3NmU0ZDY2NzIzZWQ1YjdhOWQ3NGU2OWNjYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY29sdW1uLWZsb3ctY3Jhc2guaHRtbApA QCAtMCwwICsxLDE0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRl c3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzdHls ZT4KKyAgaHRtbCwgYm9keSB7CisgICAgZmxleC1mbG93OiBjb2x1bW47CisgICAgd2lkdGg6IGlu dHJpbnNpYzsKKyAgICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOworICAgIGRpc3BsYXk6IGZs ZXg7CisgIH0KKzwvc3R5bGU+CitQYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCEKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jcmFzaC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmZhNTkzNmZkMDBjZWRhZTYzYzE0MjMwM2ZlYTgxNWU0 NDQyMzcyZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbnRy aW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1Bhc3NlcyBpZiBp dCBkb2Vzbid0IGNyYXNoIQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2lu dHJpbnNpYy13aWR0aC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJp bnNpYy13aWR0aC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQzY2U1M2Y3Y2I0MDhkYjRhOWYxMjM3 NTM4MTU1NDgxNjY1ZGZmYTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zs ZXhib3gvaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPCFET0NU WVBFIGh0bWw+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5u ZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8c3R5bGU+CisgIHAsIGJvZHkgeworICAgIGRp c3BsYXk6IGZsZXg7CisgIH0KKyAgcCB7CisgICAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsK KyAgICB3aWR0aDogaW50cmluc2ljOworICB9Cis8L3N0eWxlPgorPGJvZHk+Cis8cD5QYXNzZXMg aWYgaXQgZG9lc24ndCBjcmFzaCE8L3A+Cis8L2JvZHk+Cg== 431067 2021-06-10 06:15:52 -0700 2021-06-10 09:41:17 -0700 Patch bug-226790-20210610151550.patch text/plain 8655 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Njk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E2YTU3MTJhNzJjZmEx MWYzMjY4NjUxMjY0MDI2YzhhOGMxMzZiYS4uY2Y1NDhkMDc2YmRkMmVjYmFjNDAxZjgzZGMwNTMw OGE0Mjg3ODFmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA2LTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgaW50cmluc2ljIGxpa2Ug Ki1jb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjY3OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUcmVhdCBpbnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQgZm9yIGludHJpbnNpYyBsb2dpY2FsCisg ICAgICAgIGNvbnRlbnQgY2FsY3VsYXRpb25zLgorCisgICAgICAgIFRlc3RzOiBmYXN0L2ZsZXhi b3gvaW50cmluc2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWwKKyAgICAgICAgICAgICAg IGZhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRtbAorICAgICAgICAgICAgICAg ZmFzdC9mbGV4Ym94L21pbi1pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRtbAorCisgICAgICAgICog cGxhdGZvcm0vTGVuZ3RoLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVu dEhlaWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0 ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgorCiAyMDIxLTA2 LTEwICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgTm9uLXVuaWZpZWQgYnVpbGQgZml4ZXMsIGVhcmx5IE1heSAyMDIxIGVkaXRpb24KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTGVuZ3RoLmgKaW5kZXggMmMyMzg0YzhhMjQ0ZTc0NDI3OTI5MmMwMmU1ZmE5YmYx NjcwNmE1MC4uZTdjYzk1OTA1M2Y5MDIzNDdmMTA0MzRiYTRhN2MwMDFjMjU0MGI0OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTGVuZ3RoLmgKQEAgLTExOSw5ICsxMTksOSBAQCBwdWJsaWM6CiAKICAgICBm bG9hdCBub25OYW5DYWxjdWxhdGVkVmFsdWUoZmxvYXQgbWF4VmFsdWUpIGNvbnN0OwogCi1wcml2 YXRlOgogICAgIGJvb2wgaXNMZWdhY3lJbnRyaW5zaWMoKSBjb25zdDsKIAorcHJpdmF0ZToKICAg ICBib29sIGlzQ2FsY3VsYXRlZEVxdWFsKGNvbnN0IExlbmd0aCYpIGNvbnN0OwogCiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCByZWYoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKaW5kZXggMjUwMmY3M2RjYjJjMTYyMzI1MjJiZGExNTJlYjE0NjA0MTA3NGVmMC4u YTFkMmY4YWJiYjE1ZTVmOTYwY2VjOTFkNzA0N2VmY2U2N2Q4ODZiNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTMxMjEsNyArMzEyMSw3IEBAIHN0ZDo6b3B0aW9u YWw8TGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRI ZWlnaHRVc2luZyhMCiB7CiAgICAgLy8gRklYTUU6IFRoZSBDU1Mgc2l6aW5nIHNwZWMgaXMgY29u c2lkZXJpbmcgY2hhbmdpbmcgd2hhdCBtaW4tY29udGVudC9tYXgtY29udGVudCBzaG91bGQgcmVz b2x2ZSB0by4KICAgICAvLyBJZiB0aGF0IGhhcHBlbnMsIHRoaXMgY29kZSB3aWxsIGhhdmUgdG8g Y2hhbmdlLgotICAgIGlmIChsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxv Z2ljYWxIZWlnaHRMZW5ndGguaXNNYXhDb250ZW50KCkgfHwgbG9naWNhbEhlaWdodExlbmd0aC5p c0ZpdENvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWluSW50cmluc2ljKCkpIHsK KyAgICBpZiAobG9naWNhbEhlaWdodExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVp Z2h0TGVuZ3RoLmlzTWF4Q29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250 ZW50KCkgfHwgbG9naWNhbEhlaWdodExlbmd0aC5pc0xlZ2FjeUludHJpbnNpYygpKSB7CiAgICAg ICAgIGlmIChpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIHN0eWxlKCkuYm94U2l6aW5nKCkgPT0g Qm94U2l6aW5nOjpCb3JkZXJCb3gpCiAgICAgICAgICAgICByZXR1cm4gaW50cmluc2ljQ29udGVu dEhlaWdodC52YWx1ZSgpICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAgICAg ICAgcmV0dXJuIGludHJpbnNpY0NvbnRlbnRIZWlnaHQ7CkBAIC0zMTM4LDcgKzMxMzgsNyBAQCBz dGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0ZUNvbnRlbnRBbmRTY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0VXNpbgogICAgICAgICByZXR1cm4gaGVpZ2h0VHlwZSA9PSBNaW5T aXplID8gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PigwKSA6IHN0ZDo6bnVsbG9wdDsKICAgICAv LyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3BlYyBpcyBjb25zaWRlcmluZyBjaGFuZ2luZyB3aGF0 IG1pbi1jb250ZW50L21heC1jb250ZW50IHNob3VsZCByZXNvbHZlIHRvLgogICAgIC8vIElmIHRo YXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwgaGF2ZSB0byBjaGFuZ2UuCi0gICAgaWYgKGhlaWdo dC5pc0ludHJpbnNpYygpIHx8IGhlaWdodC5pc01pbkludHJpbnNpYygpKQorICAgIGlmIChoZWln aHQuaXNJbnRyaW5zaWMoKSB8fCBoZWlnaHQuaXNMZWdhY3lJbnRyaW5zaWMoKSkKICAgICAgICAg cmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKGhlaWdodCwg aW50cmluc2ljQ29udGVudEhlaWdodCwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSk7 CiAgICAgaWYgKGhlaWdodC5pc0ZpeGVkKCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGhl aWdodC52YWx1ZSgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZDVkNzRjZWEyNDU2NGU2NDE0N2FjZjM1YjljMTE4NWRl NjBkZGI2Li4zMmVhMjFlNmE0MzhmZmI4M2VhZTNlOWYwNTZmYjFmZTAxZThmYmU1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMjEtMDYtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K KworICAgICAgICBUcmVhdCBpbnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjc5MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyBmb3IgaW50cmluc2lj IGFuZCBtaW4taW50cmluc2ljIGFuZCBtb3ZlIHJlbGV2YW50IHRlc3RzIHRvIGZhc3QvZmxleGJv eC4KKworICAgICAgICAqIGZhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY29sdW1uLWZsb3ct Y3Jhc2gtZXhwZWN0ZWQudHh0OiBDb3BpZWQgZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4 LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0LgorICAgICAgICAqIGZhc3Qv ZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY29sdW1uLWZsb3ctY3Jhc2guaHRtbDogQ29waWVkIGZy b20gTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxleC1ib3gtaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0 bWwuCisgICAgICAgICogZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jcmFzaC1leHBlY3Rl ZC50eHQ6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNp Yy13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQuCisgICAgICAgICogZmFzdC9mbGV4Ym94L2ludHJp bnNpYy13aWR0aC1jcmFzaC5odG1sOiBDb3BpZWQgZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9m bGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRtbC4KKyAgICAgICAgKiBmYXN0L2ZsZXhi b3gvbWluLWludHJpbnNpYy13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQ6IFJlbmFtZWQgZnJvbSBM YXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0 ZWQudHh0LgorICAgICAgICAqIGZhc3QvZmxleGJveC9taW4taW50cmluc2ljLXdpZHRoLWNyYXNo Lmh0bWw6IFJlbmFtZWQgZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5z aWMtd2lkdGgtY3Jhc2guaHRtbC4KKwogMjAyMS0wNi0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2Fs aWEuY29tPgogCiAgICAgICAgIE51bGwgY2hlY2sgcGFnZSBpbiBnZW5lcmF0ZUNlcnRpZmljYXRl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lk dGgtY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmxleC1ib3gtaW50 cmluc2ljLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggYmZhNTkzNmZkMDBjZWRhZTYzYzE0MjMwM2ZlYTgxNWU0NDQyMzcyZS4uMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0CisrKyAvZGV2L251 bGwKQEAgLTEgKzAsMCBAQAotUGFzc2VzIGlmIGl0IGRvZXNuJ3QgY3Jhc2ghCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mbGV4LWJveC1pbnRyaW5zaWMtd2lkdGgtY3Jhc2guaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1jcmFzaC5o dG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzZGNiZTNkYjRkMzQ1ZjAxYTVmZWE5 YmRkODRiOGQ2YTRjNGMwZTMxLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwCi0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZsZXgtYm94LWludHJpbnNpYy13aWR0aC1j cmFzaC5odG1sCisrKyAvZGV2L251bGwKQEAgLTEsMTMgKzAsMCBAQAotPHNjcmlwdD4KLWlmICh3 aW5kb3cudGVzdFJ1bm5lcikKLSAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKLTwvc2NyaXB0 PgotPHN0eWxlPgotICBodG1sLCBib2R5IHsKLSAgICBmbGV4LWZsb3c6IGNvbHVtbjsKLSAgICB3 aWR0aDogaW50cmluc2ljOwotICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7Ci0gICAgZGlz cGxheTogZmxleDsKLSAgfQotPC9zdHlsZT4KLVBhc3NlcyBpZiBpdCBkb2Vzbid0IGNyYXNoIQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1 bW4tZmxvdy1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50 cmluc2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5i ZmE1OTM2ZmQwMGNlZGFlNjNjMTQyMzAzZmVhODE1ZTQ0NDIzNzJlCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jb2x1bW4tZmxvdy1j cmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorUGFzc2VzIGlmIGl0IGRvZXNuJ3QgY3Jh c2ghCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50cmluc2ljLXdpZHRo LWNvbHVtbi1mbG93LWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50cmlu c2ljLXdpZHRoLWNvbHVtbi1mbG93LWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDBhNjU4MGYxYzZi ZjQ3NmU0ZDY2NzIzZWQ1YjdhOWQ3NGU2OWNjYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY29sdW1uLWZsb3ctY3Jhc2guaHRtbApA QCAtMCwwICsxLDE0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRl c3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzdHls ZT4KKyAgaHRtbCwgYm9keSB7CisgICAgZmxleC1mbG93OiBjb2x1bW47CisgICAgd2lkdGg6IGlu dHJpbnNpYzsKKyAgICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOworICAgIGRpc3BsYXk6IGZs ZXg7CisgIH0KKzwvc3R5bGU+CitQYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCEKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbnRyaW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy13aWR0aC1jcmFzaC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmZhNTkzNmZkMDBjZWRhZTYzYzE0MjMwM2ZlYTgxNWU0 NDQyMzcyZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbnRy aW5zaWMtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1Bhc3NlcyBpZiBp dCBkb2Vzbid0IGNyYXNoIQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2lu dHJpbnNpYy13aWR0aC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJp bnNpYy13aWR0aC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQzY2U1M2Y3Y2I0MDhkYjRhOWYxMjM3 NTM4MTU1NDgxNjY1ZGZmYTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zs ZXhib3gvaW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPCFET0NU WVBFIGh0bWw+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5u ZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8c3R5bGU+CisgIHAsIGJvZHkgeworICAgIGRp c3BsYXk6IGZsZXg7CisgIH0KKyAgcCB7CisgICAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsK KyAgICB3aWR0aDogaW50cmluc2ljOworICB9Cis8L3N0eWxlPgorPGJvZHk+Cis8cD5QYXNzZXMg aWYgaXQgZG9lc24ndCBjcmFzaCE8L3A+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2ZsZXhib3gvbWluLWludHJpbnNpYy13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvbWluLWludHJpbnNpYy13aWR0aC1jcmFzaC1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYmZhNTkzNmZkMDBjZWRhZTYzYzE0MjMwM2ZlYTgxNWU0NDQyMzcy ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9taW4taW50cmlu c2ljLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQYXNzZXMgaWYgaXQg ZG9lc24ndCBjcmFzaCEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9taW4t aW50cmluc2ljLXdpZHRoLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvbWlu LWludHJpbnNpYy13aWR0aC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkxODRiMjg0MDk2N2Q2Mzc3 NGU3OTU5MTg3ZTIzZjI2MWNiOTY2N2MKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2ZsZXhib3gvbWluLWludHJpbnNpYy13aWR0aC1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMTcg QEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAg ICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPHN0eWxlPgorICBwLCBib2R5 IHsKKyAgICBkaXNwbGF5OiBmbGV4OworICB9CisgIHAgeworICAgIHdyaXRpbmctbW9kZTogdmVy dGljYWwtcmw7CisgICAgd2lkdGg6IG1pbi1pbnRyaW5zaWM7CisgIH0KKzwvc3R5bGU+Cis8Ym9k eT4KKzxwPlBhc3NlcyBpZiBpdCBkb2Vzbid0IGNyYXNoITwvcD4KKzwvYm9keT4K