214880 2020-07-28 09:47:01 -0700 http/tests/cookies/document-cookie-multiple-cookies.html is failing on Windows 2020-07-29 11:31:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214222 InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren rackler webkit-bug-importer oldest_to_newest 1675652 0 cdumez 2020-07-28 09:47:01 -0700 http/tests/cookies/document-cookie-multiple-cookies.html is failing on Windows: e.g.: https://ews-build.s3-us-west-2.amazonaws.com/Windows-EWS/r405345-31731-clean-tree/results.html -PASS document.cookie is "samesite-unspecified=0" +FAIL document.cookie should be samesite-unspecified=0. Was samesite-lax=1; samesite-strict=2; samesite-unspecified=0. 1675656 1 405368 cdumez 2020-07-28 09:59:15 -0700 Created attachment 405368 Patch 1675703 2 405384 cdumez 2020-07-28 11:46:49 -0700 Created attachment 405384 Patch 1675714 3 405384 ggaren 2020-07-28 12:07:11 -0700 Comment on attachment 405384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405384&action=review > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:201 > + RetainPtr<CFStringRef> cookieStringCF = cookieString.createCFString(); Could be auto > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:231 > + auto cookies = adoptCF(CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks)); Don't you need CFArrayCreateMutable if you want to append? Seems like a bug. Can we avoid my question about whether append is valid, and the cost of reallocation in append, by passing in { &cookie, 1 } (or syntactically valid equivalent) instead of { 0, 0 } here? 1675723 4 405390 cdumez 2020-07-28 12:19:42 -0700 Created attachment 405390 Patch 1675751 5 405390 ggaren 2020-07-28 13:05:16 -0700 Comment on attachment 405390 Patch r=me 1675753 6 405398 cdumez 2020-07-28 13:13:28 -0700 Created attachment 405398 Patch 1675803 7 405398 cdumez 2020-07-28 14:35:43 -0700 Comment on attachment 405398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405398&action=review > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:216 > + return WTFMove(cookie); Windows really does not like this return statement it seems. I tried without WTFMove() first and now with it. It is still failing. Not sure what's going on... 1675811 8 405417 cdumez 2020-07-28 14:42:59 -0700 Created attachment 405417 Patch 1675831 9 405420 cdumez 2020-07-28 15:13:55 -0700 Created attachment 405420 Patch 1675860 10 rackler 2020-07-28 17:12:25 -0700 I have marked these tests as failing while this issue is investigated. https://trac.webkit.org/changeset/265021/webkit 1675861 11 405429 cdumez 2020-07-28 17:14:20 -0700 Created attachment 405429 Patch 1675862 12 cdumez 2020-07-28 17:15:00 -0700 (In reply to Karl Rackler from comment #10) > I have marked these tests as failing while this issue is investigated. > https://trac.webkit.org/changeset/265021/webkit Thanks, I updated my patch to unskip it. 1675873 13 cdumez 2020-07-28 18:19:40 -0700 NetworkStorageSessionCFNetWin.obj : error LNK2019: unresolved external symbol __imp__CFHTTPCookieCreateWithStringAndPartition referenced in function "class WTF::RetainPtr<struct OpaqueCFHTTPCookie const *> __cdecl WebCore::parseDOMCookie(class WTF::String,struct __CFURL const *)" (?parseDOMCookie@WebCore@@YA?AV?$RetainPtr@PEBUOpaqueCFHTTPCookie@@@WTF@@VString@3@PEBU__CFURL@@@Z) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Tools\TestWebKitAPI\TestWebCoreLib.vcxproj] C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\bin64\TestWebCoreLib.dll : fatal error LNK1120: 1 unresolved externals [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Tools\TestWebKitAPI\TestWebCoreLib.vcxproj] Looks like I may not be able to use __CFHTTPCookieCreateWithStringAndPartition() on Windows... I guess I'll keep using the old API but only keep the first cookie.. 1675882 14 405433 cdumez 2020-07-28 18:48:29 -0700 Created attachment 405433 Patch 1675885 15 405433 darin 2020-07-28 19:05:04 -0700 Comment on attachment 405433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405433&action=review > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:223 > + return cookie; Getting a type mismatch on this line; maybe you need a cast somewhere to CFHTTPCookieRef? 1675900 16 405438 cdumez 2020-07-28 22:06:51 -0700 Created attachment 405438 Patch 1676022 17 405465 cdumez 2020-07-29 09:39:02 -0700 Created attachment 405465 Patch 1676026 18 405465 darin 2020-07-29 09:42:01 -0700 Comment on attachment 405465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405465&action=review > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:211 > + auto cookie = static_cast<CFHTTPCookieRef>(CFArrayGetValueAtIndex(parsedCookies.get(), 0)); Idle unimportant thought: I wonder if we can use checked_cf_cast instead of static_cast. I think it’s designed for uses like this one. 1676031 19 405467 cdumez 2020-07-29 09:45:46 -0700 Created attachment 405467 Patch 1676040 20 405467 darin 2020-07-29 10:07:57 -0700 Comment on attachment 405467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405467&action=review > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:229 > + UNUSED_PARAM(frameID); > + UNUSED_PARAM(pageID); Could use "omit the name" style for unused arguments instead of UNUSED_PARAM style. > Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp:239 > + auto cookies = adoptCF(CFArrayCreateMutable(0, 1, &kCFTypeArrayCallBacks)); > + CFArrayAppendValue(cookies.get(), cookie.get()); Not important to optimize, but this could be done more efficiently with CFArrayCreate. Like we do above for CFDictionaryCreate, although it can be done with less type casting by defining local arrays. 1676043 21 405471 cdumez 2020-07-29 10:16:44 -0700 Created attachment 405471 Patch 1676063 22 ews-feeder 2020-07-29 11:30:19 -0700 Committed r265048: <https://trac.webkit.org/changeset/265048> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405471. 1676064 23 webkit-bug-importer 2020-07-29 11:31:16 -0700 <rdar://problem/66283757> 405368 2020-07-28 09:59:15 -0700 2020-07-28 11:46:48 -0700 Patch bug-214880-20200728095914.patch text/plain 5370 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE2ZTU3MGIzMTBhNGRm ZGI1ZWFhNWU2YzNlMjFlNmM1OGMxMzU3Ny4uOGU3ZGM3OTVkMThhYmRlOTFiMDhlZjMxOWQ2NTg4 MmQ1OGEwMDEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERl bGV0ZWQuCisKIDIwMjAtMDctMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICB0aGlzVmFsdWUgaXMgbm90IGFsd2F5cyBzZXQgY29ycmVjdGx5IHdoZW4gY2FsbGlu ZyBKUyBjYWxsYmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKaW5k ZXggMWIyMTE5NmY2M2QzZDUyYmM2MjMyNTM3YTU2MGVkMmIzODBmYThjNi4uMTEwNTY3MGEwZGQx MjkxNWYzMTcyMzU3MTNhYzhjZTFlZmQ3MWJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Np b25DRk5ldFdpbi5jcHAKQEAgLTE4OCwzOCArMTg4LDQ5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZB cnJheVJlZj4gY29weUNvb2tpZXNGb3JVUkxXaXRoRmlyc3RQYXJ0eVVSTChjb25zdCBOZXR3b3Jr U3RvCiAgICAgcmV0dXJuIGFkb3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9y VVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQo KSwgc2VjdXJlKSk7CiB9CiAKLXN0YXRpYyBDRkFycmF5UmVmIGNyZWF0ZUNvb2tpZXMoQ0ZEaWN0 aW9uYXJ5UmVmIGhlYWRlckZpZWxkcywgQ0ZVUkxSZWYgdXJsKQorc3RhdGljIFJldGFpblB0cjxD RkhUVFBDb29raWVSZWY+IHBhcnNlRE9NQ29va2llKFN0cmluZyBjb29raWVTdHJpbmcsIENGVVJM UmVmIHVybCkKIHsKLSAgICBDRkFycmF5UmVmIHBhcnNlZENvb2tpZXMgPSBDRkhUVFBDb29raWVD cmVhdGVXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgaGVhZGVy RmllbGRzLCB1cmwpOwotICAgIGlmICghcGFyc2VkQ29va2llcykKLSAgICAgICAgcGFyc2VkQ29v a2llcyA9IENGQXJyYXlDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgMCwgJmtDRlR5cGVB cnJheUNhbGxCYWNrcyk7Ci0gICAgCi0gICAgcmV0dXJuIHBhcnNlZENvb2tpZXM7CisgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KKyAgICBpZiAo Y29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAv LyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8v NDQwOTAzND4KKyAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3Qg cGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKKyAgICBjb29raWVTdHJpbmcgPSB2YWx1ZS5j b250YWlucygnPScpID8gdmFsdWUgOiB2YWx1ZSArICI9IjsKKworICAgIFJldGFpblB0cjxDRlN0 cmluZ1JlZj4gY29va2llU3RyaW5nQ0YgPSBjb29raWVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsK KyAgICBhdXRvIGNvb2tpZSA9IGFkb3B0Q0YoX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdB bmRQYXJ0aXRpb24oa0NGQWxsb2NhdG9yRGVmYXVsdCwgY29va2llU3RyaW5nQ0YuZ2V0KCksIHVy bCwgbnVsbHB0cikpOworICAgIGlmICghY29va2llKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgIC8vIDxyZGFyOi8vcHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHdv dWxkIHN0b3JlIGFuIGVtcHR5IGNvb2tpZSwKKyAgICAvLyB3aGljaCB3b3VsZCBiZSBzZW50IGFz ICJDb29raWU6ID0iLiBXZSBoYXZlIGEgd29ya2Fyb3VuZCBpbiBzZXRDb29raWVzKCkgdG8gcHJl dmVudAorICAgIC8vIHRoYXQsIGJ1dCB3ZSBhbHNvIG5lZWQgdG8gYXZvaWQgc2VuZGluZyBjb29r aWVzIHRoYXQgd2VyZSBwcmV2aW91c2x5IHN0b3JlZCwgYW5kCisgICAgLy8gdGhlcmUncyBubyBo YXJtIHRvIGRvaW5nIHRoaXMgY2hlY2sgYmVjYXVzZSBzdWNoIGEgY29va2llIGlzIG5ldmVyIHZh bGlkLgorICAgIGlmICghQ0ZTdHJpbmdHZXRMZW5ndGgoY29va2llTmFtZShjb29raWUuZ2V0KCkp LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoQ0ZIVFRQQ29va2ll SXNIVFRQT25seShjb29raWUuZ2V0KCkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAg IHJldHVybiBjb29raWU7CiB9CiAKLXZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29r aWVzRnJvbURPTShjb25zdCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNv bnN0IFVSTCYgdXJsLCBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFs PFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQsIFNob3VsZEFza0lUUCwgY29uc3QgU3RyaW5nJiB2YWx1 ZSwgU2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit2b2lkIE5ldHdv cmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5 LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVu dGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRB c2tJVFAsIGNvbnN0IFN0cmluZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlD b29raWVCbG9ja2luZykgY29uc3QKIHsKICAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CiAgICAg VU5VU0VEX1BBUkFNKHBhZ2VJRCk7Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENG SFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUg c2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQotICAgICAgICBy ZXR1cm47Ci0gICAgCisKICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybENGID0gdXJsLmNyZWF0 ZUNGVVJMKCk7CisgICAgYXV0byBjb29raWUgPSBwYXJzZURPTUNvb2tpZShjb29raWVTdHJpbmcs IHVybENGLmdldCgpKTsKKyAgICBpZiAoIWNvb2tpZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg UmV0YWluUHRyPENGVVJMUmVmPiBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5j cmVhdGVDRlVSTCgpOwotICAgIAotICAgIC8vIDxodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTMxPiwgPHJkYXI6Ly80NDA5MDM0PgotICAgIC8vIGNvb2tpZXNXaXRoUmVz cG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29raWVzIHdpdGhvdXQgYSB2YWx1ZQot ICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250YWlucygnPScpID8gdmFsdWUgOiB2 YWx1ZSArICI9IjsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNvb2tpZVN0cmlu Z0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgYXV0byBjb29raWVTdHJp bmdDRlB0ciA9IGNvb2tpZVN0cmluZ0NGLmdldCgpOwotICAgIFJldGFpblB0cjxDRkRpY3Rpb25h cnlSZWY+IGhlYWRlckZpZWxkc0NGID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUoa0NGQWxs b2NhdG9yRGVmYXVsdCwKLSAgICAgICAgKGNvbnN0IHZvaWQqKikmc19zZXRDb29raWVLZXlDRiwg KGNvbnN0IHZvaWQqKikmY29va2llU3RyaW5nQ0ZQdHIsIDEsCi0gICAgICAgICZrQ0ZUeXBlRGlj dGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsK LSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gdW5maWx0ZXJlZENvb2tpZXMgPSBhZG9w dENGKGNyZWF0ZUNvb2tpZXMoaGVhZGVyRmllbGRzQ0YuZ2V0KCksIHVybENGLmdldCgpKSk7Ci0g ICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBm aWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVzLmdldCgpKS5nZXQoKSwgdXJsQ0YuZ2V0KCks IGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOworCisgICAgYXV0byBjb29raWVzID0gYWRv cHRDRihDRkFycmF5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsIDAsICZrQ0ZUeXBlQXJy YXlDYWxsQmFja3MpKTsKKyAgICBDRkFycmF5QXBwZW5kVmFsdWUoY29va2llcy5nZXQoKSwgY29v a2llKTsKKyAgICBDRkhUVFBDb29raWVTdG9yYWdlU2V0Q29va2llcyhjb29raWVTdG9yYWdlKCku Z2V0KCksIGNvb2tpZXMuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKIH0KIAogc3RhdGljIGJvb2wgY29udGFpbnNTZWN1cmVDb29raWVzKENGQXJyYXlS ZWYgY29va2llcykK 405384 2020-07-28 11:46:49 -0700 2020-07-28 12:19:40 -0700 Patch bug-214880-20200728114648.patch text/plain 5376 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE2ZTU3MGIzMTBhNGRm ZGI1ZWFhNWU2YzNlMjFlNmM1OGMxMzU3Ny4uOGU3ZGM3OTVkMThhYmRlOTFiMDhlZjMxOWQ2NTg4 MmQ1OGEwMDEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERl bGV0ZWQuCisKIDIwMjAtMDctMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICB0aGlzVmFsdWUgaXMgbm90IGFsd2F5cyBzZXQgY29ycmVjdGx5IHdoZW4gY2FsbGlu ZyBKUyBjYWxsYmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKaW5k ZXggMWIyMTE5NmY2M2QzZDUyYmM2MjMyNTM3YTU2MGVkMmIzODBmYThjNi4uYTMxYjA4NTczZmZi ZGI5YjVhMWFiMzE2NDE1YTljMzFhNmZlNGQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Np b25DRk5ldFdpbi5jcHAKQEAgLTE4OCwzOCArMTg4LDQ5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZB cnJheVJlZj4gY29weUNvb2tpZXNGb3JVUkxXaXRoRmlyc3RQYXJ0eVVSTChjb25zdCBOZXR3b3Jr U3RvCiAgICAgcmV0dXJuIGFkb3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9y VVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQo KSwgc2VjdXJlKSk7CiB9CiAKLXN0YXRpYyBDRkFycmF5UmVmIGNyZWF0ZUNvb2tpZXMoQ0ZEaWN0 aW9uYXJ5UmVmIGhlYWRlckZpZWxkcywgQ0ZVUkxSZWYgdXJsKQorc3RhdGljIFJldGFpblB0cjxD RkhUVFBDb29raWVSZWY+IHBhcnNlRE9NQ29va2llKFN0cmluZyBjb29raWVTdHJpbmcsIENGVVJM UmVmIHVybCkKIHsKLSAgICBDRkFycmF5UmVmIHBhcnNlZENvb2tpZXMgPSBDRkhUVFBDb29raWVD cmVhdGVXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgaGVhZGVy RmllbGRzLCB1cmwpOwotICAgIGlmICghcGFyc2VkQ29va2llcykKLSAgICAgICAgcGFyc2VkQ29v a2llcyA9IENGQXJyYXlDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgMCwgJmtDRlR5cGVB cnJheUNhbGxCYWNrcyk7Ci0gICAgCi0gICAgcmV0dXJuIHBhcnNlZENvb2tpZXM7CisgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KKyAgICBpZiAo Y29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAv LyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8v NDQwOTAzND4KKyAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3Qg cGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKKyAgICBjb29raWVTdHJpbmcgPSB2YWx1ZS5j b250YWlucygnPScpID8gdmFsdWUgOiB2YWx1ZSArICI9IjsKKworICAgIFJldGFpblB0cjxDRlN0 cmluZ1JlZj4gY29va2llU3RyaW5nQ0YgPSBjb29raWVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsK KyAgICBhdXRvIGNvb2tpZSA9IGFkb3B0Q0YoX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdB bmRQYXJ0aXRpb24oa0NGQWxsb2NhdG9yRGVmYXVsdCwgY29va2llU3RyaW5nQ0YuZ2V0KCksIHVy bCwgbnVsbHB0cikpOworICAgIGlmICghY29va2llKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgIC8vIDxyZGFyOi8vcHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHdv dWxkIHN0b3JlIGFuIGVtcHR5IGNvb2tpZSwKKyAgICAvLyB3aGljaCB3b3VsZCBiZSBzZW50IGFz ICJDb29raWU6ID0iLiBXZSBoYXZlIGEgd29ya2Fyb3VuZCBpbiBzZXRDb29raWVzKCkgdG8gcHJl dmVudAorICAgIC8vIHRoYXQsIGJ1dCB3ZSBhbHNvIG5lZWQgdG8gYXZvaWQgc2VuZGluZyBjb29r aWVzIHRoYXQgd2VyZSBwcmV2aW91c2x5IHN0b3JlZCwgYW5kCisgICAgLy8gdGhlcmUncyBubyBo YXJtIHRvIGRvaW5nIHRoaXMgY2hlY2sgYmVjYXVzZSBzdWNoIGEgY29va2llIGlzIG5ldmVyIHZh bGlkLgorICAgIGlmICghQ0ZTdHJpbmdHZXRMZW5ndGgoY29va2llTmFtZShjb29raWUuZ2V0KCkp LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoQ0ZIVFRQQ29va2ll SXNIVFRQT25seShjb29raWUuZ2V0KCkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAg IHJldHVybiBjb29raWU7CiB9CiAKLXZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29r aWVzRnJvbURPTShjb25zdCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNv bnN0IFVSTCYgdXJsLCBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFs PFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQsIFNob3VsZEFza0lUUCwgY29uc3QgU3RyaW5nJiB2YWx1 ZSwgU2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit2b2lkIE5ldHdv cmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5 LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVu dGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRB c2tJVFAsIGNvbnN0IFN0cmluZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlD b29raWVCbG9ja2luZykgY29uc3QKIHsKICAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CiAgICAg VU5VU0VEX1BBUkFNKHBhZ2VJRCk7Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENG SFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUg c2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQotICAgICAgICBy ZXR1cm47Ci0gICAgCisKICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybENGID0gdXJsLmNyZWF0 ZUNGVVJMKCk7CisgICAgYXV0byBjb29raWUgPSBwYXJzZURPTUNvb2tpZShjb29raWVTdHJpbmcs IHVybENGLmdldCgpKTsKKyAgICBpZiAoIWNvb2tpZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg UmV0YWluUHRyPENGVVJMUmVmPiBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5j cmVhdGVDRlVSTCgpOwotICAgIAotICAgIC8vIDxodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTMxPiwgPHJkYXI6Ly80NDA5MDM0PgotICAgIC8vIGNvb2tpZXNXaXRoUmVz cG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29raWVzIHdpdGhvdXQgYSB2YWx1ZQot ICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250YWlucygnPScpID8gdmFsdWUgOiB2 YWx1ZSArICI9IjsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNvb2tpZVN0cmlu Z0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgYXV0byBjb29raWVTdHJp bmdDRlB0ciA9IGNvb2tpZVN0cmluZ0NGLmdldCgpOwotICAgIFJldGFpblB0cjxDRkRpY3Rpb25h cnlSZWY+IGhlYWRlckZpZWxkc0NGID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUoa0NGQWxs b2NhdG9yRGVmYXVsdCwKLSAgICAgICAgKGNvbnN0IHZvaWQqKikmc19zZXRDb29raWVLZXlDRiwg KGNvbnN0IHZvaWQqKikmY29va2llU3RyaW5nQ0ZQdHIsIDEsCi0gICAgICAgICZrQ0ZUeXBlRGlj dGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsK LSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gdW5maWx0ZXJlZENvb2tpZXMgPSBhZG9w dENGKGNyZWF0ZUNvb2tpZXMoaGVhZGVyRmllbGRzQ0YuZ2V0KCksIHVybENGLmdldCgpKSk7Ci0g ICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBm aWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVzLmdldCgpKS5nZXQoKSwgdXJsQ0YuZ2V0KCks IGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOworCisgICAgYXV0byBjb29raWVzID0gYWRv cHRDRihDRkFycmF5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsIDAsICZrQ0ZUeXBlQXJy YXlDYWxsQmFja3MpKTsKKyAgICBDRkFycmF5QXBwZW5kVmFsdWUoY29va2llcy5nZXQoKSwgY29v a2llLmdldCgpKTsKKyAgICBDRkhUVFBDb29raWVTdG9yYWdlU2V0Q29va2llcyhjb29raWVTdG9y YWdlKCkuZ2V0KCksIGNvb2tpZXMuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29v a2llc0NGLmdldCgpKTsKIH0KIAogc3RhdGljIGJvb2wgY29udGFpbnNTZWN1cmVDb29raWVzKENG QXJyYXlSZWYgY29va2llcykK 405390 2020-07-28 12:19:42 -0700 2020-07-28 13:13:27 -0700 Patch bug-214880-20200728121941.patch text/plain 5425 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE2ZTU3MGIzMTBhNGRm ZGI1ZWFhNWU2YzNlMjFlNmM1OGMxMzU3Ny4uOGU3ZGM3OTVkMThhYmRlOTFiMDhlZjMxOWQ2NTg4 MmQ1OGEwMDEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERl bGV0ZWQuCisKIDIwMjAtMDctMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICB0aGlzVmFsdWUgaXMgbm90IGFsd2F5cyBzZXQgY29ycmVjdGx5IHdoZW4gY2FsbGlu ZyBKUyBjYWxsYmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKaW5k ZXggMWIyMTE5NmY2M2QzZDUyYmM2MjMyNTM3YTU2MGVkMmIzODBmYThjNi4uNjA0NjQyZDY0OWI5 NDQ5NGU5NjEwNTI4YjRiODc2MGQ4ZWNiOTllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Np b25DRk5ldFdpbi5jcHAKQEAgLTE4OCwzOCArMTg4LDQ5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZB cnJheVJlZj4gY29weUNvb2tpZXNGb3JVUkxXaXRoRmlyc3RQYXJ0eVVSTChjb25zdCBOZXR3b3Jr U3RvCiAgICAgcmV0dXJuIGFkb3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9y VVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQo KSwgc2VjdXJlKSk7CiB9CiAKLXN0YXRpYyBDRkFycmF5UmVmIGNyZWF0ZUNvb2tpZXMoQ0ZEaWN0 aW9uYXJ5UmVmIGhlYWRlckZpZWxkcywgQ0ZVUkxSZWYgdXJsKQorc3RhdGljIFJldGFpblB0cjxD RkhUVFBDb29raWVSZWY+IHBhcnNlRE9NQ29va2llKFN0cmluZyBjb29raWVTdHJpbmcsIENGVVJM UmVmIHVybCkKIHsKLSAgICBDRkFycmF5UmVmIHBhcnNlZENvb2tpZXMgPSBDRkhUVFBDb29raWVD cmVhdGVXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgaGVhZGVy RmllbGRzLCB1cmwpOwotICAgIGlmICghcGFyc2VkQ29va2llcykKLSAgICAgICAgcGFyc2VkQ29v a2llcyA9IENGQXJyYXlDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgMCwgJmtDRlR5cGVB cnJheUNhbGxCYWNrcyk7Ci0gICAgCi0gICAgcmV0dXJuIHBhcnNlZENvb2tpZXM7CisgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KKyAgICBpZiAo Y29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAv LyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8v NDQwOTAzND4KKyAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3Qg cGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKKyAgICBjb29raWVTdHJpbmcgPSB2YWx1ZS5j b250YWlucygnPScpID8gdmFsdWUgOiB2YWx1ZSArICI9IjsKKworICAgIGF1dG8gY29va2llU3Ry aW5nQ0YgPSBjb29raWVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsKKyAgICBhdXRvIGNvb2tpZSA9 IGFkb3B0Q0YoX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQYXJ0aXRpb24oa0NGQWxs b2NhdG9yRGVmYXVsdCwgY29va2llU3RyaW5nQ0YuZ2V0KCksIHVybCwgbnVsbHB0cikpOworICAg IGlmICghY29va2llKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIC8vIDxyZGFyOi8v cHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHdvdWxkIHN0b3JlIGFuIGVtcHR5 IGNvb2tpZSwKKyAgICAvLyB3aGljaCB3b3VsZCBiZSBzZW50IGFzICJDb29raWU6ID0iLiBXZSBo YXZlIGEgd29ya2Fyb3VuZCBpbiBzZXRDb29raWVzKCkgdG8gcHJldmVudAorICAgIC8vIHRoYXQs IGJ1dCB3ZSBhbHNvIG5lZWQgdG8gYXZvaWQgc2VuZGluZyBjb29raWVzIHRoYXQgd2VyZSBwcmV2 aW91c2x5IHN0b3JlZCwgYW5kCisgICAgLy8gdGhlcmUncyBubyBoYXJtIHRvIGRvaW5nIHRoaXMg Y2hlY2sgYmVjYXVzZSBzdWNoIGEgY29va2llIGlzIG5ldmVyIHZhbGlkLgorICAgIGlmICghQ0ZT dHJpbmdHZXRMZW5ndGgoY29va2llTmFtZShjb29raWUuZ2V0KCkpLmdldCgpKSkKKyAgICAgICAg cmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoQ0ZIVFRQQ29va2llSXNIVFRQT25seShjb29raWUu Z2V0KCkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBjb29raWU7CiB9 CiAKLXZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29raWVzRnJvbURPTShjb25zdCBV UkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNvbnN0IFVSTCYgdXJsLCBPcHRp b25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiBw YWdlSUQsIFNob3VsZEFza0lUUCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU2hvdWxkUmVsYXhUaGly ZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUlu Zm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBP cHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0cmlu ZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29u c3QKIHsKICAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CiAgICAgVU5VU0VEX1BBUkFNKHBhZ2VJ RCk7Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ug c3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9 Ii4KLSAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQorCisgICAgYXV0byB1cmxDRiA9IHVybC5jcmVh dGVDRlVSTCgpOworICAgIGF1dG8gY29va2llID0gcGFyc2VET01Db29raWUoY29va2llU3RyaW5n LCB1cmxDRi5nZXQoKSk7CisgICAgaWYgKCFjb29raWUpCiAgICAgICAgIHJldHVybjsKLSAgICAK LSAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybENGID0gdXJsLmNyZWF0ZUNGVVJMKCk7Ci0gICAg UmV0YWluUHRyPENGVVJMUmVmPiBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5j cmVhdGVDRlVSTCgpOwotICAgIAotICAgIC8vIDxodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTMxPiwgPHJkYXI6Ly80NDA5MDM0PgotICAgIC8vIGNvb2tpZXNXaXRoUmVz cG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29raWVzIHdpdGhvdXQgYSB2YWx1ZQot ICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250YWlucygnPScpID8gdmFsdWUgOiB2 YWx1ZSArICI9IjsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNvb2tpZVN0cmlu Z0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgYXV0byBjb29raWVTdHJp bmdDRlB0ciA9IGNvb2tpZVN0cmluZ0NGLmdldCgpOwotICAgIFJldGFpblB0cjxDRkRpY3Rpb25h cnlSZWY+IGhlYWRlckZpZWxkc0NGID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUoa0NGQWxs b2NhdG9yRGVmYXVsdCwKLSAgICAgICAgKGNvbnN0IHZvaWQqKikmc19zZXRDb29raWVLZXlDRiwg KGNvbnN0IHZvaWQqKikmY29va2llU3RyaW5nQ0ZQdHIsIDEsCi0gICAgICAgICZrQ0ZUeXBlRGlj dGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsK LSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gdW5maWx0ZXJlZENvb2tpZXMgPSBhZG9w dENGKGNyZWF0ZUNvb2tpZXMoaGVhZGVyRmllbGRzQ0YuZ2V0KCksIHVybENGLmdldCgpKSk7Ci0g ICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBm aWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVzLmdldCgpKS5nZXQoKSwgdXJsQ0YuZ2V0KCks IGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOworCisgICAgYXV0byBmaXJzdFBhcnR5Rm9y Q29va2llc0NGID0gZmlyc3RQYXJ0eS5jcmVhdGVDRlVSTCgpOworCisgICAgYXV0byBjb29raWVz ID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCAxLCAma0NGVHlwZUFycmF5Q2FsbEJh Y2tzKSk7CisgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGNvb2tpZXMuZ2V0KCksIGNvb2tpZS5nZXQo KSk7CisgICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdl dCgpLCBjb29raWVzLmdldCgpLCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXNDRi5n ZXQoKSk7CiB9CiAKIHN0YXRpYyBib29sIGNvbnRhaW5zU2VjdXJlQ29va2llcyhDRkFycmF5UmVm IGNvb2tpZXMpCg== 405398 2020-07-28 13:13:28 -0700 2020-07-28 14:42:58 -0700 Patch bug-214880-20200728131328.patch text/plain 5431 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE2ZTU3MGIzMTBhNGRm ZGI1ZWFhNWU2YzNlMjFlNmM1OGMxMzU3Ny4uZWNhZWQyYzkzNzA5NmRhOGIyZDRjMmZjZjY1YTYy NzBiYTk4NThkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICBGaXggc2Ft ZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBs ZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtT dG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9NQ29v a2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2ll c0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERlbGV0 ZWQuCisKIDIwMjAtMDctMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICB0aGlzVmFsdWUgaXMgbm90IGFsd2F5cyBzZXQgY29ycmVjdGx5IHdoZW4gY2FsbGluZyBK UyBjYWxsYmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKaW5kZXgg MWIyMTE5NmY2M2QzZDUyYmM2MjMyNTM3YTU2MGVkMmIzODBmYThjNi4uMWVlNGM1ZTViNWNlMjlh NjZmY2IzMjUxYjdiYjcwZjI1MjliNWE0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25D Rk5ldFdpbi5jcHAKQEAgLTE4OCwzOCArMTg4LDQ5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZBcnJh eVJlZj4gY29weUNvb2tpZXNGb3JVUkxXaXRoRmlyc3RQYXJ0eVVSTChjb25zdCBOZXR3b3JrU3Rv CiAgICAgcmV0dXJuIGFkb3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJM KHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQoKSwg c2VjdXJlKSk7CiB9CiAKLXN0YXRpYyBDRkFycmF5UmVmIGNyZWF0ZUNvb2tpZXMoQ0ZEaWN0aW9u YXJ5UmVmIGhlYWRlckZpZWxkcywgQ0ZVUkxSZWYgdXJsKQorc3RhdGljIFJldGFpblB0cjxDRkhU VFBDb29raWVSZWY+IHBhcnNlRE9NQ29va2llKFN0cmluZyBjb29raWVTdHJpbmcsIENGVVJMUmVm IHVybCkKIHsKLSAgICBDRkFycmF5UmVmIHBhcnNlZENvb2tpZXMgPSBDRkhUVFBDb29raWVDcmVh dGVXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgaGVhZGVyRmll bGRzLCB1cmwpOwotICAgIGlmICghcGFyc2VkQ29va2llcykKLSAgICAgICAgcGFyc2VkQ29va2ll cyA9IENGQXJyYXlDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgMCwgJmtDRlR5cGVBcnJh eUNhbGxCYWNrcyk7Ci0gICAgCi0gICAgcmV0dXJuIHBhcnNlZENvb2tpZXM7CisgICAgLy8gPHJk YXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5 IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KKyAgICBpZiAoY29v a2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAvLyA8 aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8vNDQw OTAzND4KKyAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3QgcGFy c2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKKyAgICBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250 YWlucygnPScpID8gdmFsdWUgOiB2YWx1ZSArICI9IjsKKworICAgIGF1dG8gY29va2llU3RyaW5n Q0YgPSBjb29raWVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsKKyAgICBhdXRvIGNvb2tpZSA9IGFk b3B0Q0YoX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQYXJ0aXRpb24oa0NGQWxsb2Nh dG9yRGVmYXVsdCwgY29va2llU3RyaW5nQ0YuZ2V0KCksIHVybCwgbnVsbHB0cikpOworICAgIGlm ICghY29va2llKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIC8vIDxyZGFyOi8vcHJv YmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHdvdWxkIHN0b3JlIGFuIGVtcHR5IGNv b2tpZSwKKyAgICAvLyB3aGljaCB3b3VsZCBiZSBzZW50IGFzICJDb29raWU6ID0iLiBXZSBoYXZl IGEgd29ya2Fyb3VuZCBpbiBzZXRDb29raWVzKCkgdG8gcHJldmVudAorICAgIC8vIHRoYXQsIGJ1 dCB3ZSBhbHNvIG5lZWQgdG8gYXZvaWQgc2VuZGluZyBjb29raWVzIHRoYXQgd2VyZSBwcmV2aW91 c2x5IHN0b3JlZCwgYW5kCisgICAgLy8gdGhlcmUncyBubyBoYXJtIHRvIGRvaW5nIHRoaXMgY2hl Y2sgYmVjYXVzZSBzdWNoIGEgY29va2llIGlzIG5ldmVyIHZhbGlkLgorICAgIGlmICghQ0ZTdHJp bmdHZXRMZW5ndGgoY29va2llTmFtZShjb29raWUuZ2V0KCkpLmdldCgpKSkKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CisKKyAgICBpZiAoQ0ZIVFRQQ29va2llSXNIVFRQT25seShjb29raWUuZ2V0 KCkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBXVEZNb3ZlKGNvb2tp ZSk7CiB9CiAKLXZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29raWVzRnJvbURPTShj b25zdCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNvbnN0IFVSTCYgdXJs LCBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlm aWVyPiBwYWdlSUQsIFNob3VsZEFza0lUUCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU2hvdWxkUmVs YXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vz c2lvbjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1l U2l0ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFt ZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0 IFN0cmluZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2lu ZykgY29uc3QKIHsKICAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CiAgICAgVU5VU0VEX1BBUkFN KHBhZ2VJRCk7Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0 b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29v a2llOiA9Ii4KLSAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQorCisgICAgYXV0byB1cmxDRiA9IHVy bC5jcmVhdGVDRlVSTCgpOworICAgIGF1dG8gY29va2llID0gcGFyc2VET01Db29raWUoY29va2ll U3RyaW5nLCB1cmxDRi5nZXQoKSk7CisgICAgaWYgKCFjb29raWUpCiAgICAgICAgIHJldHVybjsK LSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybENGID0gdXJsLmNyZWF0ZUNGVVJMKCk7 Ci0gICAgUmV0YWluUHRyPENGVVJMUmVmPiBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQ YXJ0eS5jcmVhdGVDRlVSTCgpOwotICAgIAotICAgIC8vIDxodHRwOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NTMxPiwgPHJkYXI6Ly80NDA5MDM0PgotICAgIC8vIGNvb2tpZXNX aXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29raWVzIHdpdGhvdXQgYSB2 YWx1ZQotICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250YWlucygnPScpID8gdmFs dWUgOiB2YWx1ZSArICI9IjsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNvb2tp ZVN0cmluZ0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgYXV0byBjb29r aWVTdHJpbmdDRlB0ciA9IGNvb2tpZVN0cmluZ0NGLmdldCgpOwotICAgIFJldGFpblB0cjxDRkRp Y3Rpb25hcnlSZWY+IGhlYWRlckZpZWxkc0NGID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUo a0NGQWxsb2NhdG9yRGVmYXVsdCwKLSAgICAgICAgKGNvbnN0IHZvaWQqKikmc19zZXRDb29raWVL ZXlDRiwgKGNvbnN0IHZvaWQqKikmY29va2llU3RyaW5nQ0ZQdHIsIDEsCi0gICAgICAgICZrQ0ZU eXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFj a3MpKTsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gdW5maWx0ZXJlZENvb2tpZXMg PSBhZG9wdENGKGNyZWF0ZUNvb2tpZXMoaGVhZGVyRmllbGRzQ0YuZ2V0KCksIHVybENGLmdldCgp KSk7Ci0gICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdl dCgpLCBmaWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVzLmdldCgpKS5nZXQoKSwgdXJsQ0Yu Z2V0KCksIGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOworCisgICAgYXV0byBmaXJzdFBh cnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5jcmVhdGVDRlVSTCgpOworCisgICAgYXV0byBj b29raWVzID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCAxLCAma0NGVHlwZUFycmF5 Q2FsbEJhY2tzKSk7CisgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGNvb2tpZXMuZ2V0KCksIGNvb2tp ZS5nZXQoKSk7CisgICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFn ZSgpLmdldCgpLCBjb29raWVzLmdldCgpLCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tp ZXNDRi5nZXQoKSk7CiB9CiAKIHN0YXRpYyBib29sIGNvbnRhaW5zU2VjdXJlQ29va2llcyhDRkFy cmF5UmVmIGNvb2tpZXMpCg== 405417 2020-07-28 14:42:59 -0700 2020-07-28 15:13:53 -0700 Patch bug-214880-20200728144258.patch text/plain 5693 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDcxYjA4NjVhYTliYzZm MTRhNTYxODRkYjcyNGUzOTdkNjJiNmRjNy4uMGE2NWZiMmZjZGI5OGNhNmI4YmNlNWExY2U2NWUx ZDJiNzhlMTliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICBGaXggc2Ft ZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBs ZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtT dG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9NQ29v a2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2ll c0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERlbGV0 ZWQuCisKIDIwMjAtMDctMjggIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBBTkdMRSBEM0QgcmVuZGVyZXIgY2FuIGNyYXNoIHdo ZW4gUGxhdGZvcm1EaXNwbGF5V2luIGlzIGRlc3RydWN0ZWQgaW4gSVBDIHRocmVhZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNl c3Npb25DRk5ldFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05l dHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYy MzI1MzdhNTYwZWQyYjM4MGZhOGM2Li41NWMwMmM4MjhkMjlhMGQxY2YzOGQ1ODlmM2FiODZiNjM2 M2ZiYzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05l dHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMzgs NiArMzgsNyBAQAogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0 Zi9Qcm9jZXNzSUQuaD4KICNpbmNsdWRlIDx3dGYvUHJvY2Vzc1ByaXZpbGVnZS5oPgorI2luY2x1 ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvU29mdExpbmtpbmcuaD4KICNpbmNs dWRlIDx3dGYvVVJMLmg+CiAjaW5jbHVkZSA8d3RmL2NmL1R5cGVDYXN0c0NGLmg+CkBAIC0xODgs MzggKzE4OSw0OSBAQCBzdGF0aWMgUmV0YWluUHRyPENGQXJyYXlSZWY+IGNvcHlDb29raWVzRm9y VVJMV2l0aEZpcnN0UGFydHlVUkwoY29uc3QgTmV0d29ya1N0bwogICAgIHJldHVybiBhZG9wdENG KENGSFRUUENvb2tpZVN0b3JhZ2VDb3B5Q29va2llc0ZvclVSTChzZXNzaW9uLmNvb2tpZVN0b3Jh Z2UoKS5nZXQoKSwgdXJsLmNyZWF0ZUNGVVJMKCkuZ2V0KCksIHNlY3VyZSkpOwogfQogCi1zdGF0 aWMgQ0ZBcnJheVJlZiBjcmVhdGVDb29raWVzKENGRGljdGlvbmFyeVJlZiBoZWFkZXJGaWVsZHMs IENGVVJMUmVmIHVybCkKK3N0YXRpYyBSZXRhaW5QdHI8Q0ZIVFRQQ29va2llUmVmPiBwYXJzZURP TUNvb2tpZShTdHJpbmcgY29va2llU3RyaW5nLCBDRlVSTFJlZiB1cmwpCiB7Ci0gICAgQ0ZBcnJh eVJlZiBwYXJzZWRDb29raWVzID0gQ0ZIVFRQQ29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVy RmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQsIGhlYWRlckZpZWxkcywgdXJsKTsKLSAgICBpZiAo IXBhcnNlZENvb2tpZXMpCi0gICAgICAgIHBhcnNlZENvb2tpZXMgPSBDRkFycmF5Q3JlYXRlKGtD RkFsbG9jYXRvckRlZmF1bHQsIDAsIDAsICZrQ0ZUeXBlQXJyYXlDYWxsQmFja3MpOwotICAgIAot ICAgIHJldHVybiBwYXJzZWRDb29raWVzOworICAgIC8vIDxyZGFyOi8vcHJvYmxlbS81NjMyODgz PiBDRkhUVFBDb29raWVTdG9yYWdlIHN0b3JlcyBhbiBlbXB0eSBjb29raWUsIHdoaWNoIHdvdWxk IGJlIHNlbnQgYXMgIkNvb2tpZTogPSIuCisgICAgaWYgKGNvb2tpZVN0cmluZy5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgLy8gPGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1MzE+LCA8cmRhcjovLzQ0MDkwMzQ+CisgICAgLy8gY29va2ll c1dpdGhSZXNwb25zZUhlYWRlckZpZWxkcyBkb2Vzbid0IHBhcnNlIGNvb2tpZXMgd2l0aG91dCBh IHZhbHVlCisgICAgY29va2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDog dmFsdWUgKyAiPSI7CisKKyAgICBhdXRvIGNvb2tpZVN0cmluZ0NGID0gY29va2llU3RyaW5nLmNy ZWF0ZUNGU3RyaW5nKCk7CisgICAgYXV0byBjb29raWUgPSBhZG9wdENGKF9DRkhUVFBDb29raWVD cmVhdGVXaXRoU3RyaW5nQW5kUGFydGl0aW9uKGtDRkFsbG9jYXRvckRlZmF1bHQsIGNvb2tpZVN0 cmluZ0NGLmdldCgpLCB1cmwsIG51bGxwdHIpKTsKKyAgICBpZiAoIWNvb2tpZSkKKyAgICAgICAg cmV0dXJuIG51bGxwdHI7CisKKyAgICAvLyA8cmRhcjovL3Byb2JsZW0vNTYzMjg4Mz4gQ0ZIVFRQ Q29va2llU3RvcmFnZSB3b3VsZCBzdG9yZSBhbiBlbXB0eSBjb29raWUsCisgICAgLy8gd2hpY2gg d291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4gV2UgaGF2ZSBhIHdvcmthcm91bmQgaW4gc2V0 Q29va2llcygpIHRvIHByZXZlbnQKKyAgICAvLyB0aGF0LCBidXQgd2UgYWxzbyBuZWVkIHRvIGF2 b2lkIHNlbmRpbmcgY29va2llcyB0aGF0IHdlcmUgcHJldmlvdXNseSBzdG9yZWQsIGFuZAorICAg IC8vIHRoZXJlJ3Mgbm8gaGFybSB0byBkb2luZyB0aGlzIGNoZWNrIGJlY2F1c2Ugc3VjaCBhIGNv b2tpZSBpcyBuZXZlciB2YWxpZC4KKyAgICBpZiAoIUNGU3RyaW5nR2V0TGVuZ3RoKGNvb2tpZU5h bWUoY29va2llLmdldCgpKS5nZXQoKSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAg aWYgKENGSFRUUENvb2tpZUlzSFRUUE9ubHkoY29va2llLmdldCgpKSkKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CisKKyAgICByZXR1cm4gY29va2llLmdldCgpOwogfQogCi12b2lkIE5ldHdvcmtT dG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBj b25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlm aWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJ VFAsIGNvbnN0IFN0cmluZyYgdmFsdWUsIFNob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2Nr aW5nKSBjb25zdAordm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZXNGcm9tRE9N KGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwgY29uc3QgVVJMJiB1 cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9uYWw8UGFnZUlkZW50 aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cmluZywg U2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0CiB7CiAgICAgVU5VU0VE X1BBUkFNKGZyYW1lSUQpOwogICAgIFVOVVNFRF9QQVJBTShwYWdlSUQpOwotICAgIC8vIDxyZGFy Oi8vcHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHN0b3JlcyBhbiBlbXB0eSBj b29raWUsIHdoaWNoIHdvdWxkIGJlIHNlbnQgYXMgIkNvb2tpZTogPSIuCi0gICAgaWYgKHZhbHVl LmlzRW1wdHkoKSkKKworICAgIGF1dG8gdXJsQ0YgPSB1cmwuY3JlYXRlQ0ZVUkwoKTsKKyAgICBh dXRvIGNvb2tpZSA9IHBhcnNlRE9NQ29va2llKGNvb2tpZVN0cmluZywgdXJsQ0YuZ2V0KCkpOwor ICAgIGlmICghY29va2llKQogICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKLSAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4s IDxyZGFyOi8vNDQwOTAzND4KLSAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRz IGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29va2ll U3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0gICAg Ci0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmlu Zy5jcmVhdGVDRlN0cmluZygpOwotICAgIGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVT dHJpbmdDRi5nZXQoKTsKLSAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVs ZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCi0g ICAgICAgIChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNv b2tpZVN0cmluZ0NGUHRyLCAxLAotICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFj a3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWlu UHRyPENGQXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVz KGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0 b3JhZ2VTZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZp bHRlcmVkQ29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29v a2llc0NGLmdldCgpKTsKKworICAgIGF1dG8gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0 UGFydHkuY3JlYXRlQ0ZVUkwoKTsKKworICAgIGF1dG8gY29va2llcyA9IGFkb3B0Q0YoQ0ZBcnJh eUNyZWF0ZU11dGFibGUoMCwgMSwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcykpOworICAgIENGQXJy YXlBcHBlbmRWYWx1ZShjb29raWVzLmdldCgpLCBjb29raWUuZ2V0KCkpOworICAgIENGSFRUUENv b2tpZVN0b3JhZ2VTZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgY29va2llcy5nZXQo KSwgdXJsQ0YuZ2V0KCksIGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOwogfQogCiBzdGF0 aWMgYm9vbCBjb250YWluc1NlY3VyZUNvb2tpZXMoQ0ZBcnJheVJlZiBjb29raWVzKQo= 405420 2020-07-28 15:13:55 -0700 2020-07-28 17:14:19 -0700 Patch bug-214880-20200728151354.patch text/plain 6515 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDcxYjA4NjVhYTliYzZm MTRhNTYxODRkYjcyNGUzOTdkNjJiNmRjNy4uMGE2NWZiMmZjZGI5OGNhNmI4YmNlNWExY2U2NWUx ZDJiNzhlMTliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICBGaXggc2Ft ZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBs ZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtT dG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9NQ29v a2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2ll c0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERlbGV0 ZWQuCisKIDIwMjAtMDctMjggIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBBTkdMRSBEM0QgcmVuZGVyZXIgY2FuIGNyYXNoIHdo ZW4gUGxhdGZvcm1EaXNwbGF5V2luIGlzIGRlc3RydWN0ZWQgaW4gSVBDIHRocmVhZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvd2luL0NGTmV0d29ya1NQSVdpbi5oIGIv U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvd2luL0NGTmV0d29ya1NQSVdpbi5oCmluZGV4IGQ5 YjQyNGZlNDhmMmU3ZjdjNWExODE4ZTRiZGM3NGY2YjEwYzRiMTMuLmNiMmVmNmE5M2EyY2YzNDcz NzYzYTFjNDAzOWYyOWQ1NDA2Mjc2MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL3dpbi9DRk5ldHdvcmtTUElXaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS93aW4vQ0ZOZXR3b3JrU1BJV2luLmgKQEAgLTU0LDUgKzU0LDYgQEAgQ0ZOX0VYUE9SVCBj b25zdCBDRlN0cmluZ1JlZiBrQ0ZTdHJlYW1Qcm9wZXJ0eUNPTk5FQ1RBZGRpdGlvbmFsSGVhZGVy czsKIENGTl9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdSZWYga0NGU3RyZWFtUHJvcGVydHlDT05ORUNU UmVzcG9uc2U7CiBDRk5fRVhQT1JUIHZvaWQgX0NGSFRUUE1lc3NhZ2VTZXRSZXNwb25zZVVSTChD RkhUVFBNZXNzYWdlUmVmLCBDRlVSTFJlZik7CiBDRk5fRVhQT1JUIHZvaWQgX0NGSFRUUE1lc3Nh Z2VTZXRSZXNwb25zZVByb3h5VVJMKENGSFRUUE1lc3NhZ2VSZWYsIENGVVJMUmVmKTsKK0NGTl9F WFBPUlQgQ0ZIVFRQQ29va2llUmVmIF9DRkhUVFBDb29raWVDcmVhdGVXaXRoU3RyaW5nQW5kUGFy dGl0aW9uKENGQWxsb2NhdG9yUmVmIGluQWxsb2NhdG9yLCBDRlN0cmluZ1JlZiBjb29raWVTdHJp bmcsIENGVVJMUmVmIGluVVJMLCBDRlN0cmluZ1JlZiBwYXJ0aXRpb25JZGVudGlmaWVyKTsKIAog V1RGX0VYVEVSTl9DX0VORApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApp bmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYwZWQyYjM4MGZhOGM2Li41NWMwMmM4Mjhk MjlhMGQxY2YzOGQ1ODlmM2FiODZiNjM2M2ZiYzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vz c2lvbkNGTmV0V2luLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgPHd0Zi9OZXZlckRl c3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KICNpbmNsdWRlIDx3dGYvUHJv Y2Vzc1ByaXZpbGVnZS5oPgorI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3 dGYvU29mdExpbmtpbmcuaD4KICNpbmNsdWRlIDx3dGYvVVJMLmg+CiAjaW5jbHVkZSA8d3RmL2Nm L1R5cGVDYXN0c0NGLmg+CkBAIC0xODgsMzggKzE4OSw0OSBAQCBzdGF0aWMgUmV0YWluUHRyPENG QXJyYXlSZWY+IGNvcHlDb29raWVzRm9yVVJMV2l0aEZpcnN0UGFydHlVUkwoY29uc3QgTmV0d29y a1N0bwogICAgIHJldHVybiBhZG9wdENGKENGSFRUUENvb2tpZVN0b3JhZ2VDb3B5Q29va2llc0Zv clVSTChzZXNzaW9uLmNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgdXJsLmNyZWF0ZUNGVVJMKCkuZ2V0 KCksIHNlY3VyZSkpOwogfQogCi1zdGF0aWMgQ0ZBcnJheVJlZiBjcmVhdGVDb29raWVzKENGRGlj dGlvbmFyeVJlZiBoZWFkZXJGaWVsZHMsIENGVVJMUmVmIHVybCkKK3N0YXRpYyBSZXRhaW5QdHI8 Q0ZIVFRQQ29va2llUmVmPiBwYXJzZURPTUNvb2tpZShTdHJpbmcgY29va2llU3RyaW5nLCBDRlVS TFJlZiB1cmwpCiB7Ci0gICAgQ0ZBcnJheVJlZiBwYXJzZWRDb29raWVzID0gQ0ZIVFRQQ29va2ll Q3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQsIGhlYWRl ckZpZWxkcywgdXJsKTsKLSAgICBpZiAoIXBhcnNlZENvb2tpZXMpCi0gICAgICAgIHBhcnNlZENv b2tpZXMgPSBDRkFycmF5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsIDAsICZrQ0ZUeXBl QXJyYXlDYWxsQmFja3MpOwotICAgIAotICAgIHJldHVybiBwYXJzZWRDb29raWVzOworICAgIC8v IDxyZGFyOi8vcHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHN0b3JlcyBhbiBl bXB0eSBjb29raWUsIHdoaWNoIHdvdWxkIGJlIHNlbnQgYXMgIkNvb2tpZTogPSIuCisgICAgaWYg KGNvb2tpZVN0cmluZy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAg Ly8gPGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MzE+LCA8cmRhcjov LzQ0MDkwMzQ+CisgICAgLy8gY29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkcyBkb2Vzbid0 IHBhcnNlIGNvb2tpZXMgd2l0aG91dCBhIHZhbHVlCisgICAgY29va2llU3RyaW5nID0gdmFsdWUu Y29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7CisKKyAgICBhdXRvIGNvb2tpZVN0 cmluZ0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7CisgICAgYXV0byBjb29raWUg PSBhZG9wdENGKF9DRkhUVFBDb29raWVDcmVhdGVXaXRoU3RyaW5nQW5kUGFydGl0aW9uKGtDRkFs bG9jYXRvckRlZmF1bHQsIGNvb2tpZVN0cmluZ0NGLmdldCgpLCB1cmwsIG51bGxwdHIpKTsKKyAg ICBpZiAoIWNvb2tpZSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAvLyA8cmRhcjov L3Byb2JsZW0vNTYzMjg4Mz4gQ0ZIVFRQQ29va2llU3RvcmFnZSB3b3VsZCBzdG9yZSBhbiBlbXB0 eSBjb29raWUsCisgICAgLy8gd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4gV2Ug aGF2ZSBhIHdvcmthcm91bmQgaW4gc2V0Q29va2llcygpIHRvIHByZXZlbnQKKyAgICAvLyB0aGF0 LCBidXQgd2UgYWxzbyBuZWVkIHRvIGF2b2lkIHNlbmRpbmcgY29va2llcyB0aGF0IHdlcmUgcHJl dmlvdXNseSBzdG9yZWQsIGFuZAorICAgIC8vIHRoZXJlJ3Mgbm8gaGFybSB0byBkb2luZyB0aGlz IGNoZWNrIGJlY2F1c2Ugc3VjaCBhIGNvb2tpZSBpcyBuZXZlciB2YWxpZC4KKyAgICBpZiAoIUNG U3RyaW5nR2V0TGVuZ3RoKGNvb2tpZU5hbWUoY29va2llLmdldCgpKS5nZXQoKSkpCisgICAgICAg IHJldHVybiBudWxscHRyOworCisgICAgaWYgKENGSFRUUENvb2tpZUlzSFRUUE9ubHkoY29va2ll LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gY29va2llLmdl dCgpOwogfQogCi12b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zyb21ET00o Y29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwmIHVy bCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRp Zmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0cmluZyYgdmFsdWUsIFNob3VsZFJl bGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nKSBjb25zdAordm9pZCBOZXR3b3JrU3RvcmFnZVNl c3Npb246OnNldENvb2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2Ft ZVNpdGVJbmZvJiwgY29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJh bWVJRCwgT3B0aW9uYWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25z dCBTdHJpbmcmIGNvb2tpZVN0cmluZywgU2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tp bmcpIGNvbnN0CiB7CiAgICAgVU5VU0VEX1BBUkFNKGZyYW1lSUQpOwogICAgIFVOVVNFRF9QQVJB TShwYWdlSUQpOwotICAgIC8vIDxyZGFyOi8vcHJvYmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVT dG9yYWdlIHN0b3JlcyBhbiBlbXB0eSBjb29raWUsIHdoaWNoIHdvdWxkIGJlIHNlbnQgYXMgIkNv b2tpZTogPSIuCi0gICAgaWYgKHZhbHVlLmlzRW1wdHkoKSkKKworICAgIGF1dG8gdXJsQ0YgPSB1 cmwuY3JlYXRlQ0ZVUkwoKTsKKyAgICBhdXRvIGNvb2tpZSA9IHBhcnNlRE9NQ29va2llKGNvb2tp ZVN0cmluZywgdXJsQ0YuZ2V0KCkpOworICAgIGlmICghY29va2llKQogICAgICAgICByZXR1cm47 Ci0gICAgCi0gICAgUmV0YWluUHRyPENGVVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgp OwotICAgIFJldGFpblB0cjxDRlVSTFJlZj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0 UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAgICAKLSAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8vNDQwOTAzND4KLSAgICAvLyBjb29raWVz V2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEg dmFsdWUKLSAgICBTdHJpbmcgY29va2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZh bHVlIDogdmFsdWUgKyAiPSI7Ci0gICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29r aWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwotICAgIGF1dG8gY29v a2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRhaW5QdHI8Q0ZE aWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRl KGtDRkFsbG9jYXRvckRlZmF1bHQsCi0gICAgICAgIChjb25zdCB2b2lkKiopJnNfc2V0Q29va2ll S2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0cmluZ0NGUHRyLCAxLAotICAgICAgICAma0NG VHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJh Y2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVz ID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQo KSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VTZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5n ZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVkQ29va2llcy5nZXQoKSkuZ2V0KCksIHVybENG LmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NGLmdldCgpKTsKKworICAgIGF1dG8gZmlyc3RQ YXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKKworICAgIGF1dG8g Y29va2llcyA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZU11dGFibGUoMCwgMSwgJmtDRlR5cGVBcnJh eUNhbGxCYWNrcykpOworICAgIENGQXJyYXlBcHBlbmRWYWx1ZShjb29raWVzLmdldCgpLCBjb29r aWUuZ2V0KCkpOworICAgIENGSFRUUENvb2tpZVN0b3JhZ2VTZXRDb29raWVzKGNvb2tpZVN0b3Jh Z2UoKS5nZXQoKSwgY29va2llcy5nZXQoKSwgdXJsQ0YuZ2V0KCksIGZpcnN0UGFydHlGb3JDb29r aWVzQ0YuZ2V0KCkpOwogfQogCiBzdGF0aWMgYm9vbCBjb250YWluc1NlY3VyZUNvb2tpZXMoQ0ZB cnJheVJlZiBjb29raWVzKQo= 405429 2020-07-28 17:14:20 -0700 2020-07-28 18:48:28 -0700 Patch bug-214880-20200728171419.patch text/plain 7150 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uOTdlM2ZjMWUwMWI1YzRiOGY4NjIzOWY1NTQ1NjA2 MDk4MTRiNDU2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICBGaXggc2Ft ZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBs ZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtT dG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9NQ29v a2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2ll c0Zyb21ET00gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29va2llcyk6IERlbGV0 ZWQuCisKIDIwMjAtMDctMjggIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbY3NzLWdyaWRdIEZpeCAnYWxpZ24tY29udGVudCcgaW4gZ3JpZCBjb250YWluZXJz IHdpdGggc21hbGwgY29udGVudCBhcmVhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwv cGFsL3NwaS93aW4vQ0ZOZXR3b3JrU1BJV2luLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS93aW4vQ0ZOZXR3b3JrU1BJV2luLmgKaW5kZXggZDliNDI0ZmU0OGYyZTdmN2M1YTE4MThlNGJk Yzc0ZjZiMTBjNGIxMy4uY2IyZWY2YTkzYTJjZjM0NzM3NjNhMWM0MDM5ZjI5ZDU0MDYyNzYxMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvd2luL0NGTmV0d29ya1NQSVdp bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL3dpbi9DRk5ldHdvcmtTUElXaW4u aApAQCAtNTQsNSArNTQsNiBAQCBDRk5fRVhQT1JUIGNvbnN0IENGU3RyaW5nUmVmIGtDRlN0cmVh bVByb3BlcnR5Q09OTkVDVEFkZGl0aW9uYWxIZWFkZXJzOwogQ0ZOX0VYUE9SVCBjb25zdCBDRlN0 cmluZ1JlZiBrQ0ZTdHJlYW1Qcm9wZXJ0eUNPTk5FQ1RSZXNwb25zZTsKIENGTl9FWFBPUlQgdm9p ZCBfQ0ZIVFRQTWVzc2FnZVNldFJlc3BvbnNlVVJMKENGSFRUUE1lc3NhZ2VSZWYsIENGVVJMUmVm KTsKIENGTl9FWFBPUlQgdm9pZCBfQ0ZIVFRQTWVzc2FnZVNldFJlc3BvbnNlUHJveHlVUkwoQ0ZI VFRQTWVzc2FnZVJlZiwgQ0ZVUkxSZWYpOworQ0ZOX0VYUE9SVCBDRkhUVFBDb29raWVSZWYgX0NG SFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQYXJ0aXRpb24oQ0ZBbGxvY2F0b3JSZWYgaW5B bGxvY2F0b3IsIENGU3RyaW5nUmVmIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgaW5VUkwsIENGU3Ry aW5nUmVmIHBhcnRpdGlvbklkZW50aWZpZXIpOwogCiBXVEZfRVhURVJOX0NfRU5ECmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vz c2lvbkNGTmV0V2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwCmluZGV4IDFiMjExOTZmNjNkM2Q1MmJjNjIz MjUzN2E1NjBlZDJiMzgwZmE4YzYuLmUyNWEzYTYzZWU1NzM3NDY3Nzk4NjJiM2ExNWU4MzIwMzNj NWJlMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXRXaW4uY3BwCkBAIC0zOCw2 ICszOCw3IEBACiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3Rm L1Byb2Nlc3NJRC5oPgogI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzUHJpdmlsZWdlLmg+CisjaW5jbHVk ZSA8d3RmL1JldGFpblB0ci5oPgogI2luY2x1ZGUgPHd0Zi9Tb2Z0TGlua2luZy5oPgogI2luY2x1 ZGUgPHd0Zi9VUkwuaD4KICNpbmNsdWRlIDx3dGYvY2YvVHlwZUNhc3RzQ0YuaD4KQEAgLTE4OCwz OCArMTg5LDQ5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY29weUNvb2tpZXNGb3JV UkxXaXRoRmlyc3RQYXJ0eVVSTChjb25zdCBOZXR3b3JrU3RvCiAgICAgcmV0dXJuIGFkb3B0Q0Yo Q0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJMKHNlc3Npb24uY29va2llU3RvcmFn ZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQoKSwgc2VjdXJlKSk7CiB9CiAKLXN0YXRp YyBDRkFycmF5UmVmIGNyZWF0ZUNvb2tpZXMoQ0ZEaWN0aW9uYXJ5UmVmIGhlYWRlckZpZWxkcywg Q0ZVUkxSZWYgdXJsKQorc3RhdGljIFJldGFpblB0cjxDRkhUVFBDb29raWVSZWY+IHBhcnNlRE9N Q29va2llKFN0cmluZyBjb29raWVTdHJpbmcsIENGVVJMUmVmIHVybCkKIHsKLSAgICBDRkFycmF5 UmVmIHBhcnNlZENvb2tpZXMgPSBDRkhUVFBDb29raWVDcmVhdGVXaXRoUmVzcG9uc2VIZWFkZXJG aWVsZHMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgaGVhZGVyRmllbGRzLCB1cmwpOwotICAgIGlmICgh cGFyc2VkQ29va2llcykKLSAgICAgICAgcGFyc2VkQ29va2llcyA9IENGQXJyYXlDcmVhdGUoa0NG QWxsb2NhdG9yRGVmYXVsdCwgMCwgMCwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcyk7Ci0gICAgCi0g ICAgcmV0dXJuIHBhcnNlZENvb2tpZXM7CisgICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+ IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQg YmUgc2VudCBhcyAiQ29va2llOiA9Ii4KKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMT4sIDxyZGFyOi8vNDQwOTAzND4KKyAgICAvLyBjb29raWVz V2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEg dmFsdWUKKyAgICBjb29raWVTdHJpbmcgPSBjb29raWVTdHJpbmcuY29udGFpbnMoJz0nKSA/IGNv b2tpZVN0cmluZyA6IGNvb2tpZVN0cmluZyArICI9IjsKKworICAgIGF1dG8gY29va2llU3RyaW5n Q0YgPSBjb29raWVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsKKyAgICBhdXRvIGNvb2tpZSA9IGFk b3B0Q0YoX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQYXJ0aXRpb24oa0NGQWxsb2Nh dG9yRGVmYXVsdCwgY29va2llU3RyaW5nQ0YuZ2V0KCksIHVybCwgbnVsbHB0cikpOworICAgIGlm ICghY29va2llKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIC8vIDxyZGFyOi8vcHJv YmxlbS81NjMyODgzPiBDRkhUVFBDb29raWVTdG9yYWdlIHdvdWxkIHN0b3JlIGFuIGVtcHR5IGNv b2tpZSwKKyAgICAvLyB3aGljaCB3b3VsZCBiZSBzZW50IGFzICJDb29raWU6ID0iLiBXZSBoYXZl IGEgd29ya2Fyb3VuZCBpbiBzZXRDb29raWVzKCkgdG8gcHJldmVudAorICAgIC8vIHRoYXQsIGJ1 dCB3ZSBhbHNvIG5lZWQgdG8gYXZvaWQgc2VuZGluZyBjb29raWVzIHRoYXQgd2VyZSBwcmV2aW91 c2x5IHN0b3JlZCwgYW5kCisgICAgLy8gdGhlcmUncyBubyBoYXJtIHRvIGRvaW5nIHRoaXMgY2hl Y2sgYmVjYXVzZSBzdWNoIGEgY29va2llIGlzIG5ldmVyIHZhbGlkLgorICAgIGlmICghQ0ZTdHJp bmdHZXRMZW5ndGgoY29va2llTmFtZShjb29raWUuZ2V0KCkpLmdldCgpKSkKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CisKKyAgICBpZiAoQ0ZIVFRQQ29va2llSXNIVFRQT25seShjb29raWUuZ2V0 KCkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBjb29raWUuZ2V0KCk7 CiB9CiAKLXZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29raWVzRnJvbURPTShjb25z dCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNvbnN0IFVSTCYgdXJsLCBP cHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVy PiBwYWdlSUQsIFNob3VsZEFza0lUUCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU2hvdWxkUmVsYXhU aGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lv bjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0 ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlE LCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0 cmluZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykg Y29uc3QKIHsKICAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CiAgICAgVU5VU0VEX1BBUkFNKHBh Z2VJRCk7Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3Jh Z2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2ll OiA9Ii4KLSAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQorCisgICAgYXV0byB1cmxDRiA9IHVybC5j cmVhdGVDRlVSTCgpOworICAgIGF1dG8gY29va2llID0gcGFyc2VET01Db29raWUoY29va2llU3Ry aW5nLCB1cmxDRi5nZXQoKSk7CisgICAgaWYgKCFjb29raWUpCiAgICAgICAgIHJldHVybjsKLSAg ICAKLSAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybENGID0gdXJsLmNyZWF0ZUNGVVJMKCk7Ci0g ICAgUmV0YWluUHRyPENGVVJMUmVmPiBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0 eS5jcmVhdGVDRlVSTCgpOwotICAgIAotICAgIC8vIDxodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTMxPiwgPHJkYXI6Ly80NDA5MDM0PgotICAgIC8vIGNvb2tpZXNXaXRo UmVzcG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29raWVzIHdpdGhvdXQgYSB2YWx1 ZQotICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSB2YWx1ZS5jb250YWlucygnPScpID8gdmFsdWUg OiB2YWx1ZSArICI9IjsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNvb2tpZVN0 cmluZ0NGID0gY29va2llU3RyaW5nLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgYXV0byBjb29raWVT dHJpbmdDRlB0ciA9IGNvb2tpZVN0cmluZ0NGLmdldCgpOwotICAgIFJldGFpblB0cjxDRkRpY3Rp b25hcnlSZWY+IGhlYWRlckZpZWxkc0NGID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUoa0NG QWxsb2NhdG9yRGVmYXVsdCwKLSAgICAgICAgKGNvbnN0IHZvaWQqKikmc19zZXRDb29raWVLZXlD RiwgKGNvbnN0IHZvaWQqKikmY29va2llU3RyaW5nQ0ZQdHIsIDEsCi0gICAgICAgICZrQ0ZUeXBl RGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3Mp KTsKLSAgICAKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gdW5maWx0ZXJlZENvb2tpZXMgPSBh ZG9wdENGKGNyZWF0ZUNvb2tpZXMoaGVhZGVyRmllbGRzQ0YuZ2V0KCksIHVybENGLmdldCgpKSk7 Ci0gICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgp LCBmaWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVzLmdldCgpKS5nZXQoKSwgdXJsQ0YuZ2V0 KCksIGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOworCisgICAgYXV0byBmaXJzdFBhcnR5 Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5jcmVhdGVDRlVSTCgpOworCisgICAgYXV0byBjb29r aWVzID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCAxLCAma0NGVHlwZUFycmF5Q2Fs bEJhY2tzKSk7CisgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGNvb2tpZXMuZ2V0KCksIGNvb2tpZS5n ZXQoKSk7CisgICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgp LmdldCgpLCBjb29raWVzLmdldCgpLCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXND Ri5nZXQoKSk7CiB9CiAKIHN0YXRpYyBib29sIGNvbnRhaW5zU2VjdXJlQ29va2llcyhDRkFycmF5 UmVmIGNvb2tpZXMpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmlu ZGV4IDk0ZjM2NTc2Yjc5NGYxMjgyZDYyNjI4YzU4YWZjMmFlMDJjZWQ5NGUuLjNiMzdmYzc5YzQx ZmRmMjA4MzMxZDZlN2YxMWQ4ZTgxYTcxNjEwZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9UZXN0RXhwZWN0YXRpb25zCkBAIC03ODIsOSArNzgyLDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0 eS9jcm9zcy1mcmFtZS1hY2Nlc3MtcG9ydC5odG1sIFsgU2tpcCBdCiAjIDxyZGFyOi8vNTcyMzEy MT4KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvY29va2llcy5odG1sIFsgU2tpcCBdCiAKLSNG YWlsaW5nIG9uIFdpbmRvd3MKLXdlYmtpdC5vcmcvYi8yMTQ4ODAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQot CiAjIDxyZGFyOi8vNTcyMzE5MT4KIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9qYXZhc2NyaXB0bGlu ay1mcmFtZXMuaHRtbCBbIFNraXAgXQogCg== 405433 2020-07-28 18:48:29 -0700 2020-07-28 22:06:49 -0700 Patch bug-214880-20200728184829.patch text/plain 6853 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uMTM5MTE4MWI5OTM3NzE0NzZhYzYxM2RjNTVhMTlh NmQ3OTZmYzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorCiAyMDIwLTA3LTI4ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1 QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggJ2FsaWduLWNvbnRlbnQnIGlu IGdyaWQgY29udGFpbmVycyB3aXRoIHNtYWxsIGNvbnRlbnQgYXJlYQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5l dFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYw ZWQyYjM4MGZhOGM2Li5hNDEwMmQ5NzYxMjUwY2E2NDYxMDI1M2JiZWQxZTcwY2UzMzE2YTk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMTg4LDM4ICsxODgs NTYgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjb3B5Q29va2llc0ZvclVSTFdpdGhG aXJzdFBhcnR5VVJMKGNvbnN0IE5ldHdvcmtTdG8KICAgICByZXR1cm4gYWRvcHRDRihDRkhUVFBD b29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0 KCksIHVybC5jcmVhdGVDRlVSTCgpLmdldCgpLCBzZWN1cmUpKTsKIH0KIAotc3RhdGljIENGQXJy YXlSZWYgY3JlYXRlQ29va2llcyhDRkRpY3Rpb25hcnlSZWYgaGVhZGVyRmllbGRzLCBDRlVSTFJl ZiB1cmwpCitzdGF0aWMgUmV0YWluUHRyPENGSFRUUENvb2tpZVJlZj4gcGFyc2VET01Db29raWUo U3RyaW5nIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgdXJsKQogewotICAgIENGQXJyYXlSZWYgcGFy c2VkQ29va2llcyA9IENGSFRUUENvb2tpZUNyZWF0ZVdpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBoZWFkZXJGaWVsZHMsIHVybCk7Ci0gICAgaWYgKCFwYXJzZWRD b29raWVzKQotICAgICAgICBwYXJzZWRDb29raWVzID0gQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCAwLCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKTsKLSAgICAKLSAgICByZXR1 cm4gcGFyc2VkQ29va2llczsKLX0KLQotdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENv b2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwg Y29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKLXsKLSAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAo dmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKICAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MT4sIDxyZGFyOi8vNDQwOTAzND4KICAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmll bGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29v a2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0g ICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0 cmluZy5jcmVhdGVDRlN0cmluZygpOworICAgIGNvb2tpZVN0cmluZyA9IGNvb2tpZVN0cmluZy5j b250YWlucygnPScpID8gY29va2llU3RyaW5nIDogY29va2llU3RyaW5nICsgIj0iOworCisgICAg YXV0byBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAg IGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9u YXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCisgICAgYXV0byBoZWFkZXJGaWVsZHNDRiA9 IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCiAgICAgICAg IChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0 cmluZ0NGUHRyLCAxLAogICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZr Q0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRl ckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVk Q29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKKyAgICAvLyBGSVhNRTogX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQ YXJ0aXRpb24oKSBpcyBjdXJyZW50bHkgdW5hdmFpbGFibGUgb24gV2luZG93cyAocmRhcjovL3By b2JsZW0vNjYyNDg1NTApLgorICAgIGF1dG8gcGFyc2VkQ29va2llcyA9IGFkb3B0Q0YoQ0ZIVFRQ Q29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQs IGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmwpKTsKKyAgICBpZiAoIXBhcnNlZENvb2tpZXMgfHwg IUNGQXJyYXlHZXRDb3VudChwYXJzZWRDb29raWVzKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKKyAgICBhdXRvIGNvb2tpZSA9IENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgocGFyc2VkQ29va2ll cywgMCk7CisKKyAgICAvLyA8cmRhcjovL3Byb2JsZW0vNTYzMjg4Mz4gQ0ZIVFRQQ29va2llU3Rv cmFnZSB3b3VsZCBzdG9yZSBhbiBlbXB0eSBjb29raWUsCisgICAgLy8gd2hpY2ggd291bGQgYmUg c2VudCBhcyAiQ29va2llOiA9Ii4gV2UgaGF2ZSBhIHdvcmthcm91bmQgaW4gc2V0Q29va2llcygp IHRvIHByZXZlbnQKKyAgICAvLyB0aGF0LCBidXQgd2UgYWxzbyBuZWVkIHRvIGF2b2lkIHNlbmRp bmcgY29va2llcyB0aGF0IHdlcmUgcHJldmlvdXNseSBzdG9yZWQsIGFuZAorICAgIC8vIHRoZXJl J3Mgbm8gaGFybSB0byBkb2luZyB0aGlzIGNoZWNrIGJlY2F1c2Ugc3VjaCBhIGNvb2tpZSBpcyBu ZXZlciB2YWxpZC4KKyAgICBpZiAoIUNGU3RyaW5nR2V0TGVuZ3RoKGNvb2tpZU5hbWUoY29va2ll KS5nZXQoKSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKENGSFRUUENvb2tp ZUlzSFRUUE9ubHkoY29va2llKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1 cm4gY29va2llOworfQorCit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zy b21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBV UkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdl SWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0cmluZyYgY29va2llU3Ry aW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKK3sKKyAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7CisgICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CisKKyAgICBh dXRvIHVybENGID0gdXJsLmNyZWF0ZUNGVVJMKCk7CisgICAgYXV0byBjb29raWUgPSBwYXJzZURP TUNvb2tpZShjb29raWVTdHJpbmcsIHVybENGLmdldCgpKTsKKyAgICBpZiAoIWNvb2tpZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgYXV0byBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQ YXJ0eS5jcmVhdGVDRlVSTCgpOworCisgICAgYXV0byBjb29raWVzID0gYWRvcHRDRihDRkFycmF5 Q3JlYXRlTXV0YWJsZSgwLCAxLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CisgICAgQ0ZBcnJh eUFwcGVuZFZhbHVlKGNvb2tpZXMuZ2V0KCksIGNvb2tpZS5nZXQoKSk7CisgICAgQ0ZIVFRQQ29v a2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBjb29raWVzLmdldCgp LCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXNDRi5nZXQoKSk7CiB9CiAKIHN0YXRp YyBib29sIGNvbnRhaW5zU2VjdXJlQ29va2llcyhDRkFycmF5UmVmIGNvb2tpZXMpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MzYyYTg0ZGUxNmY0MjRiNzE3YzYxNGRhMzljMGYwNmRlZmYxYTdhNy4uZjhjYzRhMjVjY2VmNGE2 MmYwYmJiMmJlZGQ5MGYwNmE2NzQwNTI5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA3 LTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0 cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGlu ZyBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTQ4ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVbnNraXAgdGVzdCB0aGF0IGlzIG5vIGxvbmdlciBmYWlsaW5nIG9uIFdpbmRvd3MuCisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wNy0yOCAg UnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk IHRlc3QgZ2FyZGVuaW5nLCByZW1vdmUgZHVwbGljYXRlIFRlc3RFeHBlY3RhdGlvbnMgZW50cnku CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk0ZjM2NTc2 Yjc5NGYxMjgyZDYyNjI4YzU4YWZjMmFlMDJjZWQ5NGUuLjNiMzdmYzc5YzQxZmRmMjA4MzMxZDZl N2YxMWQ4ZTgxYTcxNjEwZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0 YXRpb25zCkBAIC03ODIsOSArNzgyLDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1mcmFt ZS1hY2Nlc3MtcG9ydC5odG1sIFsgU2tpcCBdCiAjIDxyZGFyOi8vNTcyMzEyMT4KIGh0dHAvdGVz dHMveG1saHR0cHJlcXVlc3QvY29va2llcy5odG1sIFsgU2tpcCBdCiAKLSNGYWlsaW5nIG9uIFdp bmRvd3MKLXdlYmtpdC5vcmcvYi8yMTQ4ODAgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNv b2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotCiAjIDxyZGFyOi8v NTcyMzE5MT4KIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9qYXZhc2NyaXB0bGluay1mcmFtZXMuaHRt bCBbIFNraXAgXQogCg== 405438 2020-07-28 22:06:51 -0700 2020-07-29 09:39:00 -0700 Patch bug-214880-20200728220650.patch text/plain 6865 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uMTM5MTE4MWI5OTM3NzE0NzZhYzYxM2RjNTVhMTlh NmQ3OTZmYzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorCiAyMDIwLTA3LTI4ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1 QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggJ2FsaWduLWNvbnRlbnQnIGlu IGdyaWQgY29udGFpbmVycyB3aXRoIHNtYWxsIGNvbnRlbnQgYXJlYQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5l dFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYw ZWQyYjM4MGZhOGM2Li5iYWM1Nzc5MDc2YmRlOWE4MDUzODAxYzZiZDk0YjE4OTgwYjE4MzM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMTg4LDM4ICsxODgs NTYgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjb3B5Q29va2llc0ZvclVSTFdpdGhG aXJzdFBhcnR5VVJMKGNvbnN0IE5ldHdvcmtTdG8KICAgICByZXR1cm4gYWRvcHRDRihDRkhUVFBD b29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0 KCksIHVybC5jcmVhdGVDRlVSTCgpLmdldCgpLCBzZWN1cmUpKTsKIH0KIAotc3RhdGljIENGQXJy YXlSZWYgY3JlYXRlQ29va2llcyhDRkRpY3Rpb25hcnlSZWYgaGVhZGVyRmllbGRzLCBDRlVSTFJl ZiB1cmwpCitzdGF0aWMgUmV0YWluUHRyPENGSFRUUENvb2tpZVJlZj4gcGFyc2VET01Db29raWUo U3RyaW5nIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgdXJsKQogewotICAgIENGQXJyYXlSZWYgcGFy c2VkQ29va2llcyA9IENGSFRUUENvb2tpZUNyZWF0ZVdpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBoZWFkZXJGaWVsZHMsIHVybCk7Ci0gICAgaWYgKCFwYXJzZWRD b29raWVzKQotICAgICAgICBwYXJzZWRDb29raWVzID0gQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCAwLCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKTsKLSAgICAKLSAgICByZXR1 cm4gcGFyc2VkQ29va2llczsKLX0KLQotdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENv b2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwg Y29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKLXsKLSAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAo dmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKICAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MT4sIDxyZGFyOi8vNDQwOTAzND4KICAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmll bGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29v a2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0g ICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0 cmluZy5jcmVhdGVDRlN0cmluZygpOworICAgIGNvb2tpZVN0cmluZyA9IGNvb2tpZVN0cmluZy5j b250YWlucygnPScpID8gY29va2llU3RyaW5nIDogY29va2llU3RyaW5nICsgIj0iOworCisgICAg YXV0byBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAg IGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9u YXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCisgICAgYXV0byBoZWFkZXJGaWVsZHNDRiA9 IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCiAgICAgICAg IChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0 cmluZ0NGUHRyLCAxLAogICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZr Q0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRl ckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVk Q29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKKyAgICAvLyBGSVhNRTogX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQ YXJ0aXRpb24oKSBpcyBjdXJyZW50bHkgdW5hdmFpbGFibGUgb24gV2luZG93cyAocmRhcjovL3By b2JsZW0vNjYyNDg1NTApLgorICAgIGF1dG8gcGFyc2VkQ29va2llcyA9IGFkb3B0Q0YoQ0ZIVFRQ Q29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQs IGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmwpKTsKKyAgICBpZiAoIXBhcnNlZENvb2tpZXMgfHwg IUNGQXJyYXlHZXRDb3VudChwYXJzZWRDb29raWVzLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICBhdXRvIGNvb2tpZSA9IENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgocGFyc2Vk Q29va2llcy5nZXQoKSwgMCk7CisKKyAgICAvLyA8cmRhcjovL3Byb2JsZW0vNTYzMjg4Mz4gQ0ZI VFRQQ29va2llU3RvcmFnZSB3b3VsZCBzdG9yZSBhbiBlbXB0eSBjb29raWUsCisgICAgLy8gd2hp Y2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4gV2UgaGF2ZSBhIHdvcmthcm91bmQgaW4g c2V0Q29va2llcygpIHRvIHByZXZlbnQKKyAgICAvLyB0aGF0LCBidXQgd2UgYWxzbyBuZWVkIHRv IGF2b2lkIHNlbmRpbmcgY29va2llcyB0aGF0IHdlcmUgcHJldmlvdXNseSBzdG9yZWQsIGFuZAor ICAgIC8vIHRoZXJlJ3Mgbm8gaGFybSB0byBkb2luZyB0aGlzIGNoZWNrIGJlY2F1c2Ugc3VjaCBh IGNvb2tpZSBpcyBuZXZlciB2YWxpZC4KKyAgICBpZiAoIUNGU3RyaW5nR2V0TGVuZ3RoKGNvb2tp ZU5hbWUoY29va2llKS5nZXQoKSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYg KENGSFRUUENvb2tpZUlzSFRUUE9ubHkoY29va2llKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKKyAgICByZXR1cm4gY29va2llOworfQorCit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUlu Zm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBP cHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFnZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0cmlu ZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29u c3QKK3sKKyAgICBVTlVTRURfUEFSQU0oZnJhbWVJRCk7CisgICAgVU5VU0VEX1BBUkFNKHBhZ2VJ RCk7CisKKyAgICBhdXRvIHVybENGID0gdXJsLmNyZWF0ZUNGVVJMKCk7CisgICAgYXV0byBjb29r aWUgPSBwYXJzZURPTUNvb2tpZShjb29raWVTdHJpbmcsIHVybENGLmdldCgpKTsKKyAgICBpZiAo IWNvb2tpZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYXV0byBmaXJzdFBhcnR5Rm9yQ29va2ll c0NGID0gZmlyc3RQYXJ0eS5jcmVhdGVDRlVSTCgpOworCisgICAgYXV0byBjb29raWVzID0gYWRv cHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCAxLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7 CisgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGNvb2tpZXMuZ2V0KCksIGNvb2tpZS5nZXQoKSk7Cisg ICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBj b29raWVzLmdldCgpLCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXNDRi5nZXQoKSk7 CiB9CiAKIHN0YXRpYyBib29sIGNvbnRhaW5zU2VjdXJlQ29va2llcyhDRkFycmF5UmVmIGNvb2tp ZXMpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggMzYyYTg0ZGUxNmY0MjRiNzE3YzYxNGRhMzljMGYwNmRlZmYxYTdhNy4uZjhj YzRhMjVjY2VmNGE2MmYwYmJiMmJlZGQ5MGYwNmE2NzQwNTI5NyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIwLTA3LTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0 bWwgaXMgZmFpbGluZyBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTQ4ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVbnNraXAgdGVzdCB0aGF0IGlzIG5vIGxvbmdlciBmYWlsaW5nIG9u IFdpbmRvd3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9uczoKKwog MjAyMC0wNy0yOCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkIHRlc3QgZ2FyZGVuaW5nLCByZW1vdmUgZHVwbGljYXRlIFRlc3RFeHBlY3Rh dGlvbnMgZW50cnkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmlu ZGV4IDk0ZjM2NTc2Yjc5NGYxMjgyZDYyNjI4YzU4YWZjMmFlMDJjZWQ5NGUuLjNiMzdmYzc5YzQx ZmRmMjA4MzMxZDZlN2YxMWQ4ZTgxYTcxNjEwZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9UZXN0RXhwZWN0YXRpb25zCkBAIC03ODIsOSArNzgyLDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0 eS9jcm9zcy1mcmFtZS1hY2Nlc3MtcG9ydC5odG1sIFsgU2tpcCBdCiAjIDxyZGFyOi8vNTcyMzEy MT4KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvY29va2llcy5odG1sIFsgU2tpcCBdCiAKLSNG YWlsaW5nIG9uIFdpbmRvd3MKLXdlYmtpdC5vcmcvYi8yMTQ4ODAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQot CiAjIDxyZGFyOi8vNTcyMzE5MT4KIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9qYXZhc2NyaXB0bGlu ay1mcmFtZXMuaHRtbCBbIFNraXAgXQogCg== 405465 2020-07-29 09:39:02 -0700 2020-07-29 09:45:44 -0700 Patch bug-214880-20200729093901.patch text/plain 6895 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uMTM5MTE4MWI5OTM3NzE0NzZhYzYxM2RjNTVhMTlh NmQ3OTZmYzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorCiAyMDIwLTA3LTI4ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1 QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggJ2FsaWduLWNvbnRlbnQnIGlu IGdyaWQgY29udGFpbmVycyB3aXRoIHNtYWxsIGNvbnRlbnQgYXJlYQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5l dFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYw ZWQyYjM4MGZhOGM2Li4wMTE3ZGIzMjNmMjUwYzE2MmJhM2ZjMTU4MjgyYjk5ZWYyMzAwY2RhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMTg4LDM4ICsxODgs NTYgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjb3B5Q29va2llc0ZvclVSTFdpdGhG aXJzdFBhcnR5VVJMKGNvbnN0IE5ldHdvcmtTdG8KICAgICByZXR1cm4gYWRvcHRDRihDRkhUVFBD b29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0 KCksIHVybC5jcmVhdGVDRlVSTCgpLmdldCgpLCBzZWN1cmUpKTsKIH0KIAotc3RhdGljIENGQXJy YXlSZWYgY3JlYXRlQ29va2llcyhDRkRpY3Rpb25hcnlSZWYgaGVhZGVyRmllbGRzLCBDRlVSTFJl ZiB1cmwpCitzdGF0aWMgUmV0YWluUHRyPENGSFRUUENvb2tpZVJlZj4gcGFyc2VET01Db29raWUo U3RyaW5nIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgdXJsKQogewotICAgIENGQXJyYXlSZWYgcGFy c2VkQ29va2llcyA9IENGSFRUUENvb2tpZUNyZWF0ZVdpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBoZWFkZXJGaWVsZHMsIHVybCk7Ci0gICAgaWYgKCFwYXJzZWRD b29raWVzKQotICAgICAgICBwYXJzZWRDb29raWVzID0gQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCAwLCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKTsKLSAgICAKLSAgICByZXR1 cm4gcGFyc2VkQ29va2llczsKLX0KLQotdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENv b2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwg Y29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKLXsKLSAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAo dmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKICAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MT4sIDxyZGFyOi8vNDQwOTAzND4KICAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmll bGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29v a2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0g ICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0 cmluZy5jcmVhdGVDRlN0cmluZygpOworICAgIGNvb2tpZVN0cmluZyA9IGNvb2tpZVN0cmluZy5j b250YWlucygnPScpID8gY29va2llU3RyaW5nIDogY29va2llU3RyaW5nICsgIj0iOworCisgICAg YXV0byBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAg IGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9u YXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCisgICAgYXV0byBoZWFkZXJGaWVsZHNDRiA9 IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCiAgICAgICAg IChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0 cmluZ0NGUHRyLCAxLAogICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZr Q0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRl ckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVk Q29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKKyAgICAvLyBGSVhNRTogX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQ YXJ0aXRpb24oKSBpcyBjdXJyZW50bHkgdW5hdmFpbGFibGUgb24gV2luZG93cyAocmRhcjovL3By b2JsZW0vNjYyNDg1NTApLgorICAgIGF1dG8gcGFyc2VkQ29va2llcyA9IGFkb3B0Q0YoQ0ZIVFRQ Q29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQs IGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmwpKTsKKyAgICBpZiAoIXBhcnNlZENvb2tpZXMgfHwg IUNGQXJyYXlHZXRDb3VudChwYXJzZWRDb29raWVzLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICBhdXRvIGNvb2tpZSA9IHN0YXRpY19jYXN0PENGSFRUUENvb2tpZVJlZj4o Q0ZBcnJheUdldFZhbHVlQXRJbmRleChwYXJzZWRDb29raWVzLmdldCgpLCAwKSk7CisKKyAgICAv LyA8cmRhcjovL3Byb2JsZW0vNTYzMjg4Mz4gQ0ZIVFRQQ29va2llU3RvcmFnZSB3b3VsZCBzdG9y ZSBhbiBlbXB0eSBjb29raWUsCisgICAgLy8gd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2ll OiA9Ii4gV2UgaGF2ZSBhIHdvcmthcm91bmQgaW4gc2V0Q29va2llcygpIHRvIHByZXZlbnQKKyAg ICAvLyB0aGF0LCBidXQgd2UgYWxzbyBuZWVkIHRvIGF2b2lkIHNlbmRpbmcgY29va2llcyB0aGF0 IHdlcmUgcHJldmlvdXNseSBzdG9yZWQsIGFuZAorICAgIC8vIHRoZXJlJ3Mgbm8gaGFybSB0byBk b2luZyB0aGlzIGNoZWNrIGJlY2F1c2Ugc3VjaCBhIGNvb2tpZSBpcyBuZXZlciB2YWxpZC4KKyAg ICBpZiAoIUNGU3RyaW5nR2V0TGVuZ3RoKGNvb2tpZU5hbWUoY29va2llKS5nZXQoKSkpCisgICAg ICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKENGSFRUUENvb2tpZUlzSFRUUE9ubHkoY29v a2llKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gY29va2llOworfQor Cit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llc0Zyb21ET00oY29uc3QgVVJM JiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwmIHVybCwgT3B0aW9u YWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gcGFn ZUlELCBTaG91bGRBc2tJVFAsIGNvbnN0IFN0cmluZyYgY29va2llU3RyaW5nLCBTaG91bGRSZWxh eFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKK3sKKyAgICBVTlVTRURfUEFSQU0oZnJh bWVJRCk7CisgICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CisKKyAgICBhdXRvIHVybENGID0gdXJs LmNyZWF0ZUNGVVJMKCk7CisgICAgYXV0byBjb29raWUgPSBwYXJzZURPTUNvb2tpZShjb29raWVT dHJpbmcsIHVybENGLmdldCgpKTsKKyAgICBpZiAoIWNvb2tpZSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgYXV0byBmaXJzdFBhcnR5Rm9yQ29va2llc0NGID0gZmlyc3RQYXJ0eS5jcmVhdGVDRlVS TCgpOworCisgICAgYXV0byBjb29raWVzID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgw LCAxLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CisgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGNv b2tpZXMuZ2V0KCksIGNvb2tpZS5nZXQoKSk7CisgICAgQ0ZIVFRQQ29va2llU3RvcmFnZVNldENv b2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBjb29raWVzLmdldCgpLCB1cmxDRi5nZXQoKSwg Zmlyc3RQYXJ0eUZvckNvb2tpZXNDRi5nZXQoKSk7CiB9CiAKIHN0YXRpYyBib29sIGNvbnRhaW5z U2VjdXJlQ29va2llcyhDRkFycmF5UmVmIGNvb2tpZXMpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzYyYTg0ZGUxNmY0MjRi NzE3YzYxNGRhMzljMGYwNmRlZmYxYTdhNy4uZjhjYzRhMjVjY2VmNGE2MmYwYmJiMmJlZGQ5MGYw NmE2NzQwNTI5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA3LTI4ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVzL2RvY3Vt ZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5kb3dzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4ODAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgdGVz dCB0aGF0IGlzIG5vIGxvbmdlciBmYWlsaW5nIG9uIFdpbmRvd3MuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wNy0yOCAgUnlhbiBIYWRkYWQgIDxy eWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIHRlc3QgZ2FyZGVuaW5n LCByZW1vdmUgZHVwbGljYXRlIFRlc3RFeHBlY3RhdGlvbnMgZW50cnkuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk0ZjM2NTc2Yjc5NGYxMjgyZDYyNjI4 YzU4YWZjMmFlMDJjZWQ5NGUuLjNiMzdmYzc5YzQxZmRmMjA4MzMxZDZlN2YxMWQ4ZTgxYTcxNjEw ZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCkBAIC03ODIs OSArNzgyLDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1mcmFtZS1hY2Nlc3MtcG9ydC5o dG1sIFsgU2tpcCBdCiAjIDxyZGFyOi8vNTcyMzEyMT4KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVl c3QvY29va2llcy5odG1sIFsgU2tpcCBdCiAKLSNGYWlsaW5nIG9uIFdpbmRvd3MKLXdlYmtpdC5v cmcvYi8yMTQ4ODAgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1j b29raWVzLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotCiAjIDxyZGFyOi8vNTcyMzE5MT4KIGh0dHAv dGVzdHMvbmF2aWdhdGlvbi9qYXZhc2NyaXB0bGluay1mcmFtZXMuaHRtbCBbIFNraXAgXQogCg== 405467 2020-07-29 09:45:46 -0700 2020-07-29 10:16:42 -0700 Patch bug-214880-20200729094545.patch text/plain 6899 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uMTM5MTE4MWI5OTM3NzE0NzZhYzYxM2RjNTVhMTlh NmQ3OTZmYzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorCiAyMDIwLTA3LTI4ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1 QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggJ2FsaWduLWNvbnRlbnQnIGlu IGdyaWQgY29udGFpbmVycyB3aXRoIHNtYWxsIGNvbnRlbnQgYXJlYQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5l dFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYw ZWQyYjM4MGZhOGM2Li4zYTUwNjZkZjU3MDdjMWFjMTQyMjdlZWU4YjViNTI2MDY0NWIwYTQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMTg4LDM4ICsxODgs NTYgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjb3B5Q29va2llc0ZvclVSTFdpdGhG aXJzdFBhcnR5VVJMKGNvbnN0IE5ldHdvcmtTdG8KICAgICByZXR1cm4gYWRvcHRDRihDRkhUVFBD b29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0 KCksIHVybC5jcmVhdGVDRlVSTCgpLmdldCgpLCBzZWN1cmUpKTsKIH0KIAotc3RhdGljIENGQXJy YXlSZWYgY3JlYXRlQ29va2llcyhDRkRpY3Rpb25hcnlSZWYgaGVhZGVyRmllbGRzLCBDRlVSTFJl ZiB1cmwpCitzdGF0aWMgUmV0YWluUHRyPENGSFRUUENvb2tpZVJlZj4gcGFyc2VET01Db29raWUo U3RyaW5nIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgdXJsKQogewotICAgIENGQXJyYXlSZWYgcGFy c2VkQ29va2llcyA9IENGSFRUUENvb2tpZUNyZWF0ZVdpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBoZWFkZXJGaWVsZHMsIHVybCk7Ci0gICAgaWYgKCFwYXJzZWRD b29raWVzKQotICAgICAgICBwYXJzZWRDb29raWVzID0gQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCAwLCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKTsKLSAgICAKLSAgICByZXR1 cm4gcGFyc2VkQ29va2llczsKLX0KLQotdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENv b2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwg Y29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKLXsKLSAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAo dmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKICAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MT4sIDxyZGFyOi8vNDQwOTAzND4KICAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmll bGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29v a2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0g ICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0 cmluZy5jcmVhdGVDRlN0cmluZygpOworICAgIGNvb2tpZVN0cmluZyA9IGNvb2tpZVN0cmluZy5j b250YWlucygnPScpID8gY29va2llU3RyaW5nIDogY29va2llU3RyaW5nICsgIj0iOworCisgICAg YXV0byBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAg IGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9u YXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCisgICAgYXV0byBoZWFkZXJGaWVsZHNDRiA9 IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCiAgICAgICAg IChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0 cmluZ0NGUHRyLCAxLAogICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZr Q0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRl ckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVk Q29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKKyAgICAvLyBGSVhNRTogX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQ YXJ0aXRpb24oKSBpcyBjdXJyZW50bHkgdW5hdmFpbGFibGUgb24gV2luZG93cyAocmRhcjovL3By b2JsZW0vNjYyNDg1NTApLgorICAgIGF1dG8gcGFyc2VkQ29va2llcyA9IGFkb3B0Q0YoQ0ZIVFRQ Q29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQs IGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmwpKTsKKyAgICBpZiAoIXBhcnNlZENvb2tpZXMgfHwg IUNGQXJyYXlHZXRDb3VudChwYXJzZWRDb29raWVzLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICBhdXRvIGNvb2tpZSA9IGNoZWNrZWRfY2ZfY2FzdDxDRkhUVFBDb29raWVS ZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgocGFyc2VkQ29va2llcy5nZXQoKSwgMCkpOworCisg ICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugd291bGQg c3RvcmUgYW4gZW1wdHkgY29va2llLAorICAgIC8vIHdoaWNoIHdvdWxkIGJlIHNlbnQgYXMgIkNv b2tpZTogPSIuIFdlIGhhdmUgYSB3b3JrYXJvdW5kIGluIHNldENvb2tpZXMoKSB0byBwcmV2ZW50 CisgICAgLy8gdGhhdCwgYnV0IHdlIGFsc28gbmVlZCB0byBhdm9pZCBzZW5kaW5nIGNvb2tpZXMg dGhhdCB3ZXJlIHByZXZpb3VzbHkgc3RvcmVkLCBhbmQKKyAgICAvLyB0aGVyZSdzIG5vIGhhcm0g dG8gZG9pbmcgdGhpcyBjaGVjayBiZWNhdXNlIHN1Y2ggYSBjb29raWUgaXMgbmV2ZXIgdmFsaWQu CisgICAgaWYgKCFDRlN0cmluZ0dldExlbmd0aChjb29raWVOYW1lKGNvb2tpZSkuZ2V0KCkpKQor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGlmIChDRkhUVFBDb29raWVJc0hUVFBPbmx5 KGNvb2tpZSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgcmV0dXJuIGNvb2tpZTsK K30KKwordm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZXNGcm9tRE9NKGNvbnN0 IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwgY29uc3QgVVJMJiB1cmwsIE9w dGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9uYWw8UGFnZUlkZW50aWZpZXI+ IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cmluZywgU2hvdWxk UmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIGNvbnN0Cit7CisgICAgVU5VU0VEX1BBUkFN KGZyYW1lSUQpOworICAgIFVOVVNFRF9QQVJBTShwYWdlSUQpOworCisgICAgYXV0byB1cmxDRiA9 IHVybC5jcmVhdGVDRlVSTCgpOworICAgIGF1dG8gY29va2llID0gcGFyc2VET01Db29raWUoY29v a2llU3RyaW5nLCB1cmxDRi5nZXQoKSk7CisgICAgaWYgKCFjb29raWUpCisgICAgICAgIHJldHVy bjsKKworICAgIGF1dG8gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRl Q0ZVUkwoKTsKKworICAgIGF1dG8gY29va2llcyA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZU11dGFi bGUoMCwgMSwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcykpOworICAgIENGQXJyYXlBcHBlbmRWYWx1 ZShjb29raWVzLmdldCgpLCBjb29raWUuZ2V0KCkpOworICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgY29va2llcy5nZXQoKSwgdXJsQ0YuZ2V0 KCksIGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOwogfQogCiBzdGF0aWMgYm9vbCBjb250 YWluc1NlY3VyZUNvb2tpZXMoQ0ZBcnJheVJlZiBjb29raWVzKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM2MmE4NGRlMTZm NDI0YjcxN2M2MTRkYTM5YzBmMDZkZWZmMWE3YTcuLmY4Y2M0YTI1Y2NlZjRhNjJmMGJiYjJiZWRk OTBmMDZhNjc0MDUyOTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0wNy0yOCAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHAvdGVzdHMvY29va2llcy9k b2N1bWVudC1jb29raWUtbXVsdGlwbGUtY29va2llcy5odG1sIGlzIGZhaWxpbmcgb24gV2luZG93 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0ODgw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lw IHRlc3QgdGhhdCBpcyBubyBsb25nZXIgZmFpbGluZyBvbiBXaW5kb3dzLgorCisgICAgICAgICog cGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjAtMDctMjggIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IGdhcmRl bmluZywgcmVtb3ZlIGR1cGxpY2F0ZSBUZXN0RXhwZWN0YXRpb25zIGVudHJ5LgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5NGYzNjU3NmI3OTRmMTI4MmQ2 MjYyOGM1OGFmYzJhZTAyY2VkOTRlLi4zYjM3ZmM3OWM0MWZkZjIwODMzMWQ2ZTdmMTFkOGU4MWE3 MTYxMGQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0 aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucwpAQCAt NzgyLDkgKzc4Miw2IEBAIGh0dHAvdGVzdHMvc2VjdXJpdHkvY3Jvc3MtZnJhbWUtYWNjZXNzLXBv cnQuaHRtbCBbIFNraXAgXQogIyA8cmRhcjovLzU3MjMxMjE+CiBodHRwL3Rlc3RzL3htbGh0dHBy ZXF1ZXN0L2Nvb2tpZXMuaHRtbCBbIFNraXAgXQogCi0jRmFpbGluZyBvbiBXaW5kb3dzCi13ZWJr aXQub3JnL2IvMjE0ODgwIGh0dHAvdGVzdHMvY29va2llcy9kb2N1bWVudC1jb29raWUtbXVsdGlw bGUtY29va2llcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KLQogIyA8cmRhcjovLzU3MjMxOTE+CiBo dHRwL3Rlc3RzL25hdmlnYXRpb24vamF2YXNjcmlwdGxpbmstZnJhbWVzLmh0bWwgWyBTa2lwIF0K IAo= 405471 2020-07-29 10:16:44 -0700 2020-07-29 11:30:19 -0700 Patch bug-214880-20200729101643.patch text/plain 6863 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjNzc5MDUwZmI0ODlm MWE4MThkMDRiZDVlOWIzMGQyMDhiNmVjMS4uMTM5MTE4MWI5OTM3NzE0NzZhYzYxM2RjNTVhMTlh NmQ3OTZmYzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cC90ZXN0cy9jb29raWVz L2RvY3VtZW50LWNvb2tpZS1tdWx0aXBsZS1jb29raWVzLmh0bWwgaXMgZmFpbGluZyBvbiBXaW5k b3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4 ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg c2FtZSBidWcgYXMgaW4gcjI2NDk0MyBidXQgb24gV2luZG93cy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIGNvdmVyZWQgYnkgaHR0cC90ZXN0cy9jb29raWVzL2RvY3VtZW50LWNvb2tpZS1tdWx0 aXBsZS1jb29raWVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlRE9N Q29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29v a2llc0Zyb21ET00gY29uc3QpOgorCiAyMDIwLTA3LTI4ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1 QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggJ2FsaWduLWNvbnRlbnQnIGlu IGdyaWQgY29udGFpbmVycyB3aXRoIHNtYWxsIGNvbnRlbnQgYXJlYQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5l dFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAppbmRleCAxYjIxMTk2ZjYzZDNkNTJiYzYyMzI1MzdhNTYw ZWQyYjM4MGZhOGM2Li5lNGJjZGMxMjc2Y2M1MDRiMDcwMWYxY2MzN2QyOWNhZWFhZDYzMWZjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0V2luLmNwcApAQCAtMTg4LDM4ICsxODgs NTMgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjb3B5Q29va2llc0ZvclVSTFdpdGhG aXJzdFBhcnR5VVJMKGNvbnN0IE5ldHdvcmtTdG8KICAgICByZXR1cm4gYWRvcHRDRihDRkhUVFBD b29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0 KCksIHVybC5jcmVhdGVDRlVSTCgpLmdldCgpLCBzZWN1cmUpKTsKIH0KIAotc3RhdGljIENGQXJy YXlSZWYgY3JlYXRlQ29va2llcyhDRkRpY3Rpb25hcnlSZWYgaGVhZGVyRmllbGRzLCBDRlVSTFJl ZiB1cmwpCitzdGF0aWMgUmV0YWluUHRyPENGSFRUUENvb2tpZVJlZj4gcGFyc2VET01Db29raWUo U3RyaW5nIGNvb2tpZVN0cmluZywgQ0ZVUkxSZWYgdXJsKQogewotICAgIENGQXJyYXlSZWYgcGFy c2VkQ29va2llcyA9IENGSFRUUENvb2tpZUNyZWF0ZVdpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBoZWFkZXJGaWVsZHMsIHVybCk7Ci0gICAgaWYgKCFwYXJzZWRD b29raWVzKQotICAgICAgICBwYXJzZWRDb29raWVzID0gQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCAwLCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKTsKLSAgICAKLSAgICByZXR1 cm4gcGFyc2VkQ29va2llczsKLX0KLQotdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENv b2tpZXNGcm9tRE9NKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwg Y29uc3QgVVJMJiB1cmwsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCwgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCwgU2hvdWxkQXNrSVRQLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykgY29uc3QKLXsKLSAgICBV TlVTRURfUEFSQU0oZnJhbWVJRCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVt cHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUgc2VudCBhcyAiQ29va2llOiA9Ii4KLSAgICBpZiAo dmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmxDRiA9IHVybC5jcmVhdGVDRlVSTCgpOwotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gZmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKLSAg ICAKKyAgICBpZiAoY29va2llU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKICAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUz MT4sIDxyZGFyOi8vNDQwOTAzND4KICAgICAvLyBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmll bGRzIGRvZXNuJ3QgcGFyc2UgY29va2llcyB3aXRob3V0IGEgdmFsdWUKLSAgICBTdHJpbmcgY29v a2llU3RyaW5nID0gdmFsdWUuY29udGFpbnMoJz0nKSA/IHZhbHVlIDogdmFsdWUgKyAiPSI7Ci0g ICAgCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0 cmluZy5jcmVhdGVDRlN0cmluZygpOworICAgIGNvb2tpZVN0cmluZyA9IGNvb2tpZVN0cmluZy5j b250YWlucygnPScpID8gY29va2llU3RyaW5nIDogY29va2llU3RyaW5nICsgIj0iOworCisgICAg YXV0byBjb29raWVTdHJpbmdDRiA9IGNvb2tpZVN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAg IGF1dG8gY29va2llU3RyaW5nQ0ZQdHIgPSBjb29raWVTdHJpbmdDRi5nZXQoKTsKLSAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBoZWFkZXJGaWVsZHNDRiA9IGFkb3B0Q0YoQ0ZEaWN0aW9u YXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCisgICAgYXV0byBoZWFkZXJGaWVsZHNDRiA9 IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsCiAgICAgICAg IChjb25zdCB2b2lkKiopJnNfc2V0Q29va2llS2V5Q0YsIChjb25zdCB2b2lkKiopJmNvb2tpZVN0 cmluZ0NGUHRyLCAxLAogICAgICAgICAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZr Q0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7Ci0gICAgCi0gICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IHVuZmlsdGVyZWRDb29raWVzID0gYWRvcHRDRihjcmVhdGVDb29raWVzKGhlYWRl ckZpZWxkc0NGLmdldCgpLCB1cmxDRi5nZXQoKSkpOwotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VT ZXRDb29raWVzKGNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyh1bmZpbHRlcmVk Q29va2llcy5nZXQoKSkuZ2V0KCksIHVybENGLmdldCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llc0NG LmdldCgpKTsKKyAgICAvLyBGSVhNRTogX0NGSFRUUENvb2tpZUNyZWF0ZVdpdGhTdHJpbmdBbmRQ YXJ0aXRpb24oKSBpcyBjdXJyZW50bHkgdW5hdmFpbGFibGUgb24gV2luZG93cyAocmRhcjovL3By b2JsZW0vNjYyNDg1NTApLgorICAgIGF1dG8gcGFyc2VkQ29va2llcyA9IGFkb3B0Q0YoQ0ZIVFRQ Q29va2llQ3JlYXRlV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKGtDRkFsbG9jYXRvckRlZmF1bHQs IGhlYWRlckZpZWxkc0NGLmdldCgpLCB1cmwpKTsKKyAgICBpZiAoIXBhcnNlZENvb2tpZXMgfHwg IUNGQXJyYXlHZXRDb3VudChwYXJzZWRDb29raWVzLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICBhdXRvIGNvb2tpZSA9IGNoZWNrZWRfY2ZfY2FzdDxDRkhUVFBDb29raWVS ZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgocGFyc2VkQ29va2llcy5nZXQoKSwgMCkpOworCisg ICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENGSFRUUENvb2tpZVN0b3JhZ2Ugd291bGQg c3RvcmUgYW4gZW1wdHkgY29va2llLAorICAgIC8vIHdoaWNoIHdvdWxkIGJlIHNlbnQgYXMgIkNv b2tpZTogPSIuIFdlIGhhdmUgYSB3b3JrYXJvdW5kIGluIHNldENvb2tpZXMoKSB0byBwcmV2ZW50 CisgICAgLy8gdGhhdCwgYnV0IHdlIGFsc28gbmVlZCB0byBhdm9pZCBzZW5kaW5nIGNvb2tpZXMg dGhhdCB3ZXJlIHByZXZpb3VzbHkgc3RvcmVkLCBhbmQKKyAgICAvLyB0aGVyZSdzIG5vIGhhcm0g dG8gZG9pbmcgdGhpcyBjaGVjayBiZWNhdXNlIHN1Y2ggYSBjb29raWUgaXMgbmV2ZXIgdmFsaWQu CisgICAgaWYgKCFDRlN0cmluZ0dldExlbmd0aChjb29raWVOYW1lKGNvb2tpZSkuZ2V0KCkpKQor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGlmIChDRkhUVFBDb29raWVJc0hUVFBPbmx5 KGNvb2tpZSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgcmV0dXJuIGNvb2tpZTsK K30KKwordm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZXNGcm9tRE9NKGNvbnN0 IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwgY29uc3QgVVJMJiB1cmwsIE9w dGlvbmFsPEZyYW1lSWRlbnRpZmllcj4sIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiwgU2hvdWxk QXNrSVRQLCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cmluZywgU2hvdWxkUmVsYXhUaGlyZFBhcnR5 Q29va2llQmxvY2tpbmcpIGNvbnN0Cit7CisgICAgYXV0byB1cmxDRiA9IHVybC5jcmVhdGVDRlVS TCgpOworICAgIGF1dG8gY29va2llID0gcGFyc2VET01Db29raWUoY29va2llU3RyaW5nLCB1cmxD Ri5nZXQoKSk7CisgICAgaWYgKCFjb29raWUpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8g Zmlyc3RQYXJ0eUZvckNvb2tpZXNDRiA9IGZpcnN0UGFydHkuY3JlYXRlQ0ZVUkwoKTsKKworICAg IENGVHlwZVJlZiBjb29raWVzW10gPSB7IGNvb2tpZS5nZXQoKSB9OworICAgIFJldGFpblB0cjxD RkFycmF5UmVmPiBjb29raWVBcnJheSA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCBjb29raWVzLCAxLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CisgICAgQ0ZI VFRQQ29va2llU3RvcmFnZVNldENvb2tpZXMoY29va2llU3RvcmFnZSgpLmdldCgpLCBjb29raWVB cnJheS5nZXQoKSwgdXJsQ0YuZ2V0KCksIGZpcnN0UGFydHlGb3JDb29raWVzQ0YuZ2V0KCkpOwog fQogCiBzdGF0aWMgYm9vbCBjb250YWluc1NlY3VyZUNvb2tpZXMoQ0ZBcnJheVJlZiBjb29raWVz KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDM2MmE4NGRlMTZmNDI0YjcxN2M2MTRkYTM5YzBmMDZkZWZmMWE3YTcuLmY4Y2M0 YTI1Y2NlZjRhNjJmMGJiYjJiZWRkOTBmMDZhNjc0MDUyOTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAyMC0wNy0yOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAg IGh0dHAvdGVzdHMvY29va2llcy9kb2N1bWVudC1jb29raWUtbXVsdGlwbGUtY29va2llcy5odG1s IGlzIGZhaWxpbmcgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE0ODgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVW5za2lwIHRlc3QgdGhhdCBpcyBubyBsb25nZXIgZmFpbGluZyBvbiBX aW5kb3dzLgorCisgICAgICAgICogcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIw MjAtMDctMjggIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZywgcmVtb3ZlIGR1cGxpY2F0ZSBUZXN0RXhwZWN0YXRp b25zIGVudHJ5LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBl Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucwppbmRl eCA5NGYzNjU3NmI3OTRmMTI4MmQ2MjYyOGM1OGFmYzJhZTAyY2VkOTRlLi4zYjM3ZmM3OWM0MWZk ZjIwODMzMWQ2ZTdmMTFkOGU4MWE3MTYxMGQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4v VGVzdEV4cGVjdGF0aW9ucwpAQCAtNzgyLDkgKzc4Miw2IEBAIGh0dHAvdGVzdHMvc2VjdXJpdHkv Y3Jvc3MtZnJhbWUtYWNjZXNzLXBvcnQuaHRtbCBbIFNraXAgXQogIyA8cmRhcjovLzU3MjMxMjE+ CiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2Nvb2tpZXMuaHRtbCBbIFNraXAgXQogCi0jRmFp bGluZyBvbiBXaW5kb3dzCi13ZWJraXQub3JnL2IvMjE0ODgwIGh0dHAvdGVzdHMvY29va2llcy9k b2N1bWVudC1jb29raWUtbXVsdGlwbGUtY29va2llcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KLQog IyA8cmRhcjovLzU3MjMxOTE+CiBodHRwL3Rlc3RzL25hdmlnYXRpb24vamF2YXNjcmlwdGxpbmst ZnJhbWVzLmh0bWwgWyBTa2lwIF0KIAo=