219612 2020-12-07 13:27:36 -0800 Parse content after # in data URLs with HLS mime types 2020-12-07 18:02:27 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez darin eric.carlson ews-watchlist glenn japhet jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1712575 0 achristensen 2020-12-07 13:27:36 -0800 Parse content after # in data URLs with HLS mime types 1712578 1 415576 achristensen 2020-12-07 13:31:18 -0800 Created attachment 415576 Patch 1712579 2 achristensen 2020-12-07 13:31:21 -0800 <rdar://problem/71039282> 1712592 3 415576 darin 2020-12-07 13:47:24 -0800 Comment on attachment 415576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415576&action=review > Source/WebCore/platform/network/DataURLDecoder.cpp:48 > +static bool shouldRemoveFragmentIdentifier(const String& mediaType) I’d like to see a "why" comment mentioning the reason for the MIME type special cases here. Also wondering if we will keep this forever. > Source/WebCore/platform/network/DataURLDecoder.cpp:55 > + return !equalIgnoringASCIICase(mediaType, "video/mpegURL") > + && !equalIgnoringASCIICase(mediaType, "audio/mpegURL"); This could instead be written in this slightly more efficient way: return !equalLettersIgnoringASCIICase(mediaType, "video/mpegurl") && !equalLettersIgnoringASCIICase(mediaType, "audio/mpegurl"); > Source/WebCore/platform/network/DataURLDecoder.cpp:127 > - const String urlString; > + URL url; This is a much bigger object. Is that OK? 1712600 4 415576 darin 2020-12-07 13:56:08 -0800 Comment on attachment 415576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415576&action=review > Source/WebCore/platform/network/DataURLDecoder.cpp:54 > + return !equalIgnoringASCIICase(mediaType, "video/mpegURL") Would be nice if this was turned off if "Disable Site-specific Hacks" was set. While we are not limiting this to a particular website, turning this off to test if the website works without the quirk is something that fits the mission of that menu item and switch. 1712603 5 415576 darin 2020-12-07 13:57:22 -0800 Comment on attachment 415576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415576&action=review >> Source/WebCore/platform/network/DataURLDecoder.cpp:54 >> + return !equalIgnoringASCIICase(mediaType, "video/mpegURL") > > Would be nice if this was turned off if "Disable Site-specific Hacks" was set. While we are not limiting this to a particular website, turning this off to test if the website works without the quirk is something that fits the mission of that menu item and switch. Do non-Apple WebKit ports want this quirk? I’m guessing no, since they don’t have HTTP Live Streaming. 1712606 6 achristensen 2020-12-07 14:00:50 -0800 From what I understand, this is not site-specific or likely to go away because HLS manifests use # in the middle and aren't about to stop. I will restrict it to cocoa platforms, though. 1712608 7 achristensen 2020-12-07 14:02:44 -0800 A URL is 32 bytes bigger than a String, but that's not significant compared to sizeof(DecodeTask) plus typical data URL sizes, and it's a very short-lived object. We need the URL to know where to start removing the fragment that we've already found when parsing the URL. 1712609 8 415581 achristensen 2020-12-07 14:05:29 -0800 Created attachment 415581 Patch 1712628 9 415588 achristensen 2020-12-07 14:53:05 -0800 Created attachment 415588 Patch 1712631 10 415588 darin 2020-12-07 14:55:50 -0800 Comment on attachment 415588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415588&action=review > Source/WebCore/platform/network/DataURLDecoder.cpp:58 > + return !equalIgnoringASCIICase(mediaType, "video/mpegurl") > + && !equalIgnoringASCIICase(mediaType, "audio/mpegurl") > + && !equalIgnoringASCIICase(mediaType, "application/x-mpegurl") > + && !equalIgnoringASCIICase(mediaType, "vnd.apple.mpegurl"); This lowercases things as required by equalLettersIgnoringASCIICase, but didn’t add the word "Letters" to the function name. 1712634 11 415591 achristensen 2020-12-07 14:57:35 -0800 Created attachment 415591 Patch 1712644 12 ews-feeder 2020-12-07 15:44:10 -0800 Committed r270526: <https://trac.webkit.org/changeset/270526> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415591. 415576 2020-12-07 13:31:18 -0800 2020-12-07 14:05:27 -0800 Patch bug-219612-20201207133118.patch text/plain 8861 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5NTBmOTE5ZWNhMTA1 ZDk5Zjk2YWYzY2ExOTE5NjJhNDQ1M2ExZC4uZjA5OTY2OWRiZjA1NDIwNTFiMTZmNjY5NDU5Mzk1 NDI0NGQ3YTI4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTA3ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFyc2Ug Y29udGVudCBhZnRlciAjIGluIGRhdGEgVVJMcyB3aXRoIEhMUyBtaW1lIHR5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2MTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcxMDM5MjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIHIyNjc5OTUgbWFkZSB1cyBjb25mb3JtIHRvIHRoZSBiZWhhdmlv ciBvZiBDaHJvbWUgYW5kIEZpcmVmb3ggYnkgcmVtb3ZpbmcgZnJhZ21lbnRzIGZyb20gZGF0YSBV UkxzIGJlZm9yZSBwYXJzaW5nLgorICAgICAgICBXaGlsZSB0aGlzIGlzIGRlc2lyYWJsZSwgdGhl cmUgaXMgY29udGVudCBpbiBTYWZhcmktc3BlY2lmaWMgSExTIGRhdGEgVVJMcyB0aGF0IG5lZWRz IHRoZSBjb250ZW50IGluY2x1ZGluZyBhbmQgYWZ0ZXIgIy4KKyAgICAgICAgU28sIHRvIGZpeCB0 aGlzLCB3YWl0IHVudGlsIGFmdGVyIHdlIGtub3cgdGhlIG1pbWUgdHlwZSBhbmQgcmVtb3ZlIHRo ZSBmcmFnbWVudCBpZiBpdCdzIG5vdCBITFMuCisKKyAgICAgICAgVGVzdDogZmFzdC91cmwvZGF0 YS11cmwtbWVkaWF0eXBlLmh0bWwKKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFVUkwpOgorICAg ICAgICAoV2ViQ29yZTo6c2hvdWxkU3RyaXBGcmFnbWVudElkZW50aWZpZXIpOiBEZWxldGVkLgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVSTERlY29kZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RGF0YVVSTERlY29kZXI6OnNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcik6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6RGVjb2RlVGFz ayk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6cHJvY2Vz cyk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6Y3JlYXRlRGVjb2RlVGFzayk6 CisKIDIwMjAtMTItMDcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAog ICAgICAgICBOb24tdW5pZmllZCBidWlsZCBmaXhlcywgZWFybHkgRGVjZW1iZXIgMjAyMCBlZGl0 aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAzMGIwOGE4 ZGNlMWNkZmQyMmJhYmM0ZTgzM2FmNGNiOGRkZGJmZTdiLi5iMzU0ZTdhYWFmNzk1ZWE1ZjY3NGEx MTJiNGRkZGQ1YTBlZDA4MWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRl ci5jcHAKQEAgLTU0LDEwICs1NCw2IEBACiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVy Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogCi0jaWYgUExBVEZPUk0oQ09DT0EpCi0jaW5jbHVk ZSAiVmVyc2lvbkNoZWNrcy5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJ T05TKQogI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgogI2VuZGlmCkBAIC0yNTIs MTUgKzI0OCw2IEBAIEZyYW1lTG9hZGVyKiBSZXNvdXJjZUxvYWRlcjo6ZnJhbWVMb2FkZXIoKSBj b25zdAogICAgIHJldHVybiAmbV9mcmFtZS0+bG9hZGVyKCk7CiB9CiAKLXN0YXRpYyBib29sIHNo b3VsZFN0cmlwRnJhZ21lbnRJZGVudGlmaWVyKCkKLXsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAg ICByZXR1cm4gbGlua2VkT25PckFmdGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFn bWVudFJlbW92YWwpOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbmRpZgotfQotCiB2b2lk IFJlc291cmNlTG9hZGVyOjpsb2FkRGF0YVVSTCgpCiB7CiAgICAgYXV0byB1cmwgPSBtX3JlcXVl c3QudXJsKCk7CkBAIC0yNzQsOCArMjYxLDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6bG9hZERh dGFVUkwoKQogICAgIGF1dG8gbW9kZSA9IERhdGFVUkxEZWNvZGVyOjpNb2RlOjpMZWdhY3k7CiAg ICAgaWYgKG1fcmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rl cjo6RmV0Y2gpCiAgICAgICAgIG1vZGUgPSBEYXRhVVJMRGVjb2Rlcjo6TW9kZTo6Rm9yZ2l2aW5n QmFzZTY0OwotICAgIGlmIChzaG91bGRTdHJpcEZyYWdtZW50SWRlbnRpZmllcigpKQotICAgICAg ICB1cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CiAgICAgRGF0YVVSTERlY29kZXI6OmRl Y29kZSh1cmwsIHNjaGVkdWxlQ29udGV4dCwgbW9kZSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgdXJsXShhdXRvIGRlY29kZVJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAg IGlmICh0aGlzLT5yZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAgICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMRGVjb2Rl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNw cAppbmRleCBkYmU3YTBmZGU2OTZiYjlmNmEzM2MwZTVjOTU0ODU0YzFhYzBmMTg1Li5hMDRiOTcw ODdiZWVmYTc0NTA3YTYxOWI4NGY0MTgxMjNjOGE5ZDQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApAQCAtMzgsOSArMzgsMjMg QEAKICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0 Lmg+CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNsdWRlICJWZXJzaW9uQ2hlY2tzLmgiCisj ZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERhdGFVUkxEZWNvZGVyIHsK IAorc3RhdGljIGJvb2wgc2hvdWxkUmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFN0cmlu ZyYgbWVkaWFUeXBlKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmICghbGlua2VkT25P ckFmdGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVudFJlbW92YWwpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKyAgICByZXR1cm4gIWVxdWFsSWdub3JpbmdBU0NJ SUNhc2UobWVkaWFUeXBlLCAidmlkZW8vbXBlZ1VSTCIpCisgICAgICAgICYmICFlcXVhbElnbm9y aW5nQVNDSUlDYXNlKG1lZGlhVHlwZSwgImF1ZGlvL21wZWdVUkwiKTsKK30KKwogc3RhdGljIFdv cmtRdWV1ZSYgZGVjb2RlUXVldWUoKQogewogICAgIHN0YXRpYyBhdXRvJiBxdWV1ZSA9IFdvcmtR dWV1ZTo6Y3JlYXRlKCJvcmcud2Via2l0LkRhdGFVUkxEZWNvZGVyIiwgV29ya1F1ZXVlOjpUeXBl OjpTZXJpYWwsIFdvcmtRdWV1ZTo6UU9TOjpVc2VySW5pdGlhdGVkKS5sZWFrUmVmKCk7CkBAIC01 Nyw4ICs3MSw4IEBAIHN0YXRpYyBSZXN1bHQgcGFyc2VNZWRpYVR5cGUoY29uc3QgU3RyaW5nJiBt ZWRpYVR5cGUpCiBzdHJ1Y3QgRGVjb2RlVGFzayB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CiBwdWJsaWM6Ci0gICAgRGVjb2RlVGFzayhjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29u c3QgU2NoZWR1bGVDb250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNvbXBsZXRpb25IYW5k bGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCi0gICAgICAgIDogdXJsU3RyaW5nKHVybFN0cmluZy5p c29sYXRlZENvcHkoKSkKKyAgICBEZWNvZGVUYXNrKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTY2hl ZHVsZUNvbnRleHQmIHNjaGVkdWxlQ29udGV4dCwgRGVjb2RlQ29tcGxldGlvbkhhbmRsZXImJiBj b21wbGV0aW9uSGFuZGxlcikKKyAgICAgICAgOiB1cmwodXJsLmlzb2xhdGVkQ29weSgpKQogICAg ICAgICAsIHNjaGVkdWxlQ29udGV4dChzY2hlZHVsZUNvbnRleHQpCiAgICAgICAgICwgY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCiAgICAgewpAQCAtNzEsMTgg Kzg1LDE4IEBAIHB1YmxpYzoKICAgICAgICAgLy8gIGhlYWRlciA6PSBbPG1lZGlhdHlwZT5dWzti YXNlNjRdCiAgICAgICAgIC8vICBtZWRpYXR5cGUgOj0gWzxtaW1ldHlwZT5dWztjaGFyc2V0PTxj aGFyc2V0dHlwZT5dCiAKLSAgICAgICAgaWYgKHVybFN0cmluZy5maW5kKCcsJykgPT0gbm90Rm91 bmQpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICAgICAgY29uc3QgY2hhciBkYXRh U3RyaW5nW10gPSAiZGF0YToiOwotICAgICAgICBBU1NFUlQodXJsU3RyaW5nLnN0YXJ0c1dpdGgo ZGF0YVN0cmluZykpOworICAgICAgICBBU1NFUlQodXJsLnN0cmluZygpLnN0YXJ0c1dpdGgoZGF0 YVN0cmluZykpOwogCiAgICAgICAgIHNpemVfdCBoZWFkZXJTdGFydCA9IHN0cmxlbihkYXRhU3Ry aW5nKTsKLSAgICAgICAgc2l6ZV90IGhlYWRlckVuZCA9IHVybFN0cmluZy5maW5kKCcsJywgaGVh ZGVyU3RhcnQpOworICAgICAgICBzaXplX3QgaGVhZGVyRW5kID0gdXJsLnN0cmluZygpLmZpbmQo JywnLCBoZWFkZXJTdGFydCk7CisgICAgICAgIGlmIChoZWFkZXJFbmQgPT0gbm90Rm91bmQpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChzaXplX3QgZnJhZ21lbnRJbkhl YWRlciA9IHVybC5zdHJpbmcoKS5yZXZlcnNlRmluZCgnIycsIGhlYWRlckVuZCk7IGZyYWdtZW50 SW5IZWFkZXIgIT0gbm90Rm91bmQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IHNpemVfdCBlbmNvZGVkRGF0YVN0YXJ0ID0gaGVhZGVyRW5kID09IG5vdEZvdW5kID8gaGVhZGVy RW5kIDogaGVhZGVyRW5kICsgMTsKIAotICAgICAgICBlbmNvZGVkRGF0YSA9IFN0cmluZ1ZpZXco dXJsU3RyaW5nKS5zdWJzdHJpbmcoZW5jb2RlZERhdGFTdGFydCk7Ci0gICAgICAgIGF1dG8gaGVh ZGVyID0gU3RyaW5nVmlldyh1cmxTdHJpbmcpLnN1YnN0cmluZyhoZWFkZXJTdGFydCwgaGVhZGVy RW5kIC0gaGVhZGVyU3RhcnQpOworICAgICAgICBhdXRvIGhlYWRlciA9IFN0cmluZ1ZpZXcodXJs LnN0cmluZygpKS5zdWJzdHJpbmcoaGVhZGVyU3RhcnQsIGhlYWRlckVuZCAtIGhlYWRlclN0YXJ0 KTsKICAgICAgICAgCiAgICAgICAgIC8vIFRoZXJlIG1pZ2h0IG9uZSBvciB0d28gc2VtaWNvbG9u cyBpbiB0aGUgaGVhZGVyLCBmaW5kIHRoZSBsYXN0IG9uZS4KICAgICAgICAgc2l6ZV90IG1lZGlh VHlwZUVuZCA9IGhlYWRlci5yZXZlcnNlRmluZCgnOycpOwpAQCAtMTAxLDExICsxMTUsMTYgQEAg cHVibGljOgogICAgICAgICBpZiAobWVkaWFUeXBlLnN0YXJ0c1dpdGgoJzsnKSkKICAgICAgICAg ICAgIG1lZGlhVHlwZS5pbnNlcnQoInRleHQvcGxhaW4iLCAwKTsKIAorICAgICAgICBpZiAoc2hv dWxkUmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKG1lZGlhVHlwZSkpCisgICAgICAgICAgICB1cmwu cmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CisKKyAgICAgICAgZW5jb2RlZERhdGEgPSBTdHJp bmdWaWV3KHVybC5zdHJpbmcoKSkuc3Vic3RyaW5nKGVuY29kZWREYXRhU3RhcnQpOworCiAgICAg ICAgIHJlc3VsdCA9IHBhcnNlTWVkaWFUeXBlKG1lZGlhVHlwZSk7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIAotICAgIGNvbnN0IFN0cmluZyB1cmxTdHJpbmc7CisgICAgVVJMIHVybDsK ICAgICBTdHJpbmdWaWV3IGVuY29kZWREYXRhOwogICAgIGJvb2wgaXNCYXNlNjQgeyBmYWxzZSB9 OwogICAgIGNvbnN0IFNjaGVkdWxlQ29udGV4dCBzY2hlZHVsZUNvbnRleHQ7CkBAIC0xMTcsNyAr MTM2LDcgQEAgcHVibGljOgogc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVUYXNrPiBjcmVh dGVEZWNvZGVUYXNrKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTY2hlZHVsZUNvbnRleHQmIHNjaGVk dWxlQ29udGV4dCwgRGVjb2RlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikK IHsKICAgICByZXR1cm4gbWFrZVVuaXF1ZTxEZWNvZGVUYXNrPigKLSAgICAgICAgdXJsLnN0cmlu ZygpLAorICAgICAgICB1cmwsCiAgICAgICAgIHNjaGVkdWxlQ29udGV4dCwKICAgICAgICAgV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikKICAgICApOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM4YzAzMWViMzFmZmM2MWE2 NTc0YjgxOGJjODc4ZDhkMTA3OWM2ZjcuLjkzNzlkZjBhMDk0Y2JiODJjYzNlYzA1Nzk4NDUyY2U1 YTg5YjM1ZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0xMi0wNyAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFBhcnNlIGNvbnRlbnQg YWZ0ZXIgIyBpbiBkYXRhIFVSTHMgd2l0aCBITFMgbWltZSB0eXBlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NjEyCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS83MTAzOTI4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS5odG1sOiBBZGRlZC4K KwogMjAyMC0xMi0wNyAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1N0cmVhbWVyXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYmF1ZGlvL3Ro ZS1hdWRpby1hcGkvdGhlLWNoYW5uZWxtZXJnZXJub2RlLWludGVyZmFjZS9hY3RpdmUtcHJvY2Vz c2luZy5odHRwcy5odG1sIGlzIGZsYWt5IGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdlYjc2 Zjk4N2U3NDNiZjUyOGMzYmJjMzdjZTA4YTg4ZTU3ZjZiM2YKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsNiBAQAorQUxFUlQ6IHRleHQxCitBTEVSVDogdGV4dDIjbm90aWdub3JlZAorQUxFUlQ6 IHRleHQzI25vdGlnbm9yZWQKK0NPTlNPTEUgTUVTU0FHRTogRmV0Y2ggQVBJIGNhbm5vdCBsb2Fk IGRhdGE6dGUjeHQvcGxhaW4sdGV4dDQuCitBTEVSVDogY2F1Z2h0IGVycm9yIGZyb20gZGF0YSBV Ukwgd2l0aCAjIGluIGhlYWRlcgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3VybC9k YXRhLXVybC1tZWRpYXR5cGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdXJsL2RhdGEtdXJsLW1l ZGlhdHlwZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjllMDZjNDc1ZDA4MDBlYTVhZGNkM2QyNWQzZWY3Nzg4 N2JjMDkyYTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVy bC1tZWRpYXR5cGUuaHRtbApAQCAtMCwwICsxLDI5IEBACis8c2NyaXB0PgorICBpZiAod2luZG93 LnRlc3RSdW5uZXIpIHsKKyAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgdGVz dFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgIH0KKworICBhc3luYyBmdW5jdGlvbiBydW5UZXN0 KCkgeworICAgICAgbGV0IHIxID0gYXdhaXQgZmV0Y2goImRhdGE6dGV4dC9wbGFpbix0ZXh0MSNp Z25vcmVkIik7CisgICAgICBsZXQgdDEgPSBhd2FpdCByMS50ZXh0KCk7CisgICAgICBhbGVydCh0 MSk7CisKKyAgICAgIGxldCByMiA9IGF3YWl0IGZldGNoKCJkYXRhOmF1ZGlvL21wZWdVUkwsdGV4 dDIjbm90aWdub3JlZCIpOworICAgICAgbGV0IHQyID0gYXdhaXQgcjIudGV4dCgpOworICAgICAg YWxlcnQodDIpOworCisgICAgICBsZXQgcjMgPSBhd2FpdCBmZXRjaCgiZGF0YTp2aWRlby9tcGVn VVJMLHRleHQzI25vdGlnbm9yZWQiKTsKKyAgICAgIGxldCB0MyA9IGF3YWl0IHIzLnRleHQoKTsK KyAgICAgIGFsZXJ0KHQzKTsKKworICAgICAgdHJ5IHsKKwkgIGF3YWl0IGZldGNoKCJkYXRhOnRl I3h0L3BsYWluLHRleHQ0IikKKyAgICAgIH0gY2F0Y2ggKGUpIHsKKwkgIGFsZXJ0KCJjYXVnaHQg ZXJyb3IgZnJvbSBkYXRhIFVSTCB3aXRoICMgaW4gaGVhZGVyIik7CisgICAgICB9CisKKyAgICAg IGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeyB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsgfQorICB9 CisgIHJ1blRlc3QoKTsKKzwvc2NyaXB0Pgo= 415581 2020-12-07 14:05:29 -0800 2020-12-07 14:53:03 -0800 Patch bug-219612-20201207140528.patch text/plain 8934 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5NTBmOTE5ZWNhMTA1 ZDk5Zjk2YWYzY2ExOTE5NjJhNDQ1M2ExZC4uMThhOTJkODk2NGFiNGIxZjc3OTA4YWQyYzFlNDIx Nzk0NjczZmU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTA3ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFyc2Ug Y29udGVudCBhZnRlciAjIGluIGRhdGEgVVJMcyB3aXRoIEhMUyBtaW1lIHR5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2MTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcxMDM5MjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIHIyNjc5OTUgbWFkZSB1cyBjb25mb3JtIHRvIHRoZSBiZWhhdmlvciBv ZiBDaHJvbWUgYW5kIEZpcmVmb3ggYnkgcmVtb3ZpbmcgZnJhZ21lbnRzIGZyb20gZGF0YSBVUkxz IGJlZm9yZSBwYXJzaW5nLgorICAgICAgICBXaGlsZSB0aGlzIGlzIGRlc2lyYWJsZSwgdGhlcmUg aXMgY29udGVudCBpbiBTYWZhcmktc3BlY2lmaWMgSExTIGRhdGEgVVJMcyB0aGF0IG5lZWRzIHRo ZSBjb250ZW50IGluY2x1ZGluZyBhbmQgYWZ0ZXIgIy4KKyAgICAgICAgU28sIHRvIGZpeCB0aGlz LCB3YWl0IHVudGlsIGFmdGVyIHdlIGtub3cgdGhlIG1pbWUgdHlwZSBhbmQgcmVtb3ZlIHRoZSBm cmFnbWVudCBpZiBpdCdzIG5vdCBITFMuCisKKyAgICAgICAgVGVzdDogZmFzdC91cmwvZGF0YS11 cmwtbWVkaWF0eXBlLmh0bWwKKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6c2hvdWxkU3RyaXBGcmFnbWVudElkZW50aWZpZXIpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVSTERlY29kZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YVVSTERlY29kZXI6OnNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcik6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6RGVjb2RlVGFzayk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6cHJvY2Vzcyk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6Y3JlYXRlRGVjb2RlVGFzayk6CisK IDIwMjAtMTItMDcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAg ICAgICBOb24tdW5pZmllZCBidWlsZCBmaXhlcywgZWFybHkgRGVjZW1iZXIgMjAyMCBlZGl0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAzMGIwOGE4ZGNl MWNkZmQyMmJhYmM0ZTgzM2FmNGNiOGRkZGJmZTdiLi5iMzU0ZTdhYWFmNzk1ZWE1ZjY3NGExMTJi NGRkZGQ1YTBlZDA4MWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5j cHAKQEAgLTU0LDEwICs1NCw2IEBACiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogCi0jaWYgUExBVEZPUk0oQ09DT0EpCi0jaW5jbHVkZSAi VmVyc2lvbkNoZWNrcy5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05T KQogI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgogI2VuZGlmCkBAIC0yNTIsMTUg KzI0OCw2IEBAIEZyYW1lTG9hZGVyKiBSZXNvdXJjZUxvYWRlcjo6ZnJhbWVMb2FkZXIoKSBjb25z dAogICAgIHJldHVybiAmbV9mcmFtZS0+bG9hZGVyKCk7CiB9CiAKLXN0YXRpYyBib29sIHNob3Vs ZFN0cmlwRnJhZ21lbnRJZGVudGlmaWVyKCkKLXsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBy ZXR1cm4gbGlua2VkT25PckFmdGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVu dFJlbW92YWwpOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbmRpZgotfQotCiB2b2lkIFJl c291cmNlTG9hZGVyOjpsb2FkRGF0YVVSTCgpCiB7CiAgICAgYXV0byB1cmwgPSBtX3JlcXVlc3Qu dXJsKCk7CkBAIC0yNzQsOCArMjYxLDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFV UkwoKQogICAgIGF1dG8gbW9kZSA9IERhdGFVUkxEZWNvZGVyOjpNb2RlOjpMZWdhY3k7CiAgICAg aWYgKG1fcmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6 RmV0Y2gpCiAgICAgICAgIG1vZGUgPSBEYXRhVVJMRGVjb2Rlcjo6TW9kZTo6Rm9yZ2l2aW5nQmFz ZTY0OwotICAgIGlmIChzaG91bGRTdHJpcEZyYWdtZW50SWRlbnRpZmllcigpKQotICAgICAgICB1 cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CiAgICAgRGF0YVVSTERlY29kZXI6OmRlY29k ZSh1cmwsIHNjaGVkdWxlQ29udGV4dCwgbW9kZSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgdXJsXShhdXRvIGRlY29kZVJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlm ICh0aGlzLT5yZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMRGVjb2Rlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApp bmRleCBkYmU3YTBmZGU2OTZiYjlmNmEzM2MwZTVjOTU0ODU0YzFhYzBmMTg1Li4zMjQyMjQwMjZk NzFhZDk2NmMxNWY3NTZkN2EwZmY2MjYwZWIyZDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApAQCAtMzgsOSArMzgsMjcgQEAK ICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0Lmg+ CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNsdWRlICJWZXJzaW9uQ2hlY2tzLmgiCisjZW5k aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERhdGFVUkxEZWNvZGVyIHsKIAor c3RhdGljIGJvb2wgc2hvdWxkUmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYg bWVkaWFUeXBlKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmICghbGlua2VkT25PckFm dGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVudFJlbW92YWwpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBITFMgdXNlcyAjIGluIHRoZSBtaWRkbGUgb2YgdGhl IG1hbmlmZXN0cy4KKyAgICByZXR1cm4gIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UobWVkaWFUeXBl LCAidmlkZW8vbXBlZ3VybCIpCisgICAgICAgICYmICFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG1l ZGlhVHlwZSwgImF1ZGlvL21wZWd1cmwiKTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2Vu ZGlmCit9CisKIHN0YXRpYyBXb3JrUXVldWUmIGRlY29kZVF1ZXVlKCkKIHsKICAgICBzdGF0aWMg YXV0byYgcXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgib3JnLndlYmtpdC5EYXRhVVJMRGVjb2Rl ciIsIFdvcmtRdWV1ZTo6VHlwZTo6U2VyaWFsLCBXb3JrUXVldWU6OlFPUzo6VXNlckluaXRpYXRl ZCkubGVha1JlZigpOwpAQCAtNTcsOCArNzUsOCBAQCBzdGF0aWMgUmVzdWx0IHBhcnNlTWVkaWFU eXBlKGNvbnN0IFN0cmluZyYgbWVkaWFUeXBlKQogc3RydWN0IERlY29kZVRhc2sgewogICAgIFdU Rl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIERlY29kZVRhc2soY29uc3QgU3Ry aW5nJiB1cmxTdHJpbmcsIGNvbnN0IFNjaGVkdWxlQ29udGV4dCYgc2NoZWR1bGVDb250ZXh0LCBE ZWNvZGVDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQotICAgICAgICA6IHVy bFN0cmluZyh1cmxTdHJpbmcuaXNvbGF0ZWRDb3B5KCkpCisgICAgRGVjb2RlVGFzayhjb25zdCBV UkwmIHVybCwgY29uc3QgU2NoZWR1bGVDb250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNv bXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgIDogdXJsKHVybC5p c29sYXRlZENvcHkoKSkKICAgICAgICAgLCBzY2hlZHVsZUNvbnRleHQoc2NoZWR1bGVDb250ZXh0 KQogICAgICAgICAsIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KQogICAgIHsKQEAgLTcxLDE4ICs4OSwxOCBAQCBwdWJsaWM6CiAgICAgICAgIC8vICBoZWFkZXIg Oj0gWzxtZWRpYXR5cGU+XVs7YmFzZTY0XQogICAgICAgICAvLyAgbWVkaWF0eXBlIDo9IFs8bWlt ZXR5cGU+XVs7Y2hhcnNldD08Y2hhcnNldHR5cGU+XQogCi0gICAgICAgIGlmICh1cmxTdHJpbmcu ZmluZCgnLCcpID09IG5vdEZvdW5kKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAg ICAgIGNvbnN0IGNoYXIgZGF0YVN0cmluZ1tdID0gImRhdGE6IjsKLSAgICAgICAgQVNTRVJUKHVy bFN0cmluZy5zdGFydHNXaXRoKGRhdGFTdHJpbmcpKTsKKyAgICAgICAgQVNTRVJUKHVybC5zdHJp bmcoKS5zdGFydHNXaXRoKGRhdGFTdHJpbmcpKTsKIAogICAgICAgICBzaXplX3QgaGVhZGVyU3Rh cnQgPSBzdHJsZW4oZGF0YVN0cmluZyk7Ci0gICAgICAgIHNpemVfdCBoZWFkZXJFbmQgPSB1cmxT dHJpbmcuZmluZCgnLCcsIGhlYWRlclN0YXJ0KTsKKyAgICAgICAgc2l6ZV90IGhlYWRlckVuZCA9 IHVybC5zdHJpbmcoKS5maW5kKCcsJywgaGVhZGVyU3RhcnQpOworICAgICAgICBpZiAoaGVhZGVy RW5kID09IG5vdEZvdW5kKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAo c2l6ZV90IGZyYWdtZW50SW5IZWFkZXIgPSB1cmwuc3RyaW5nKCkucmV2ZXJzZUZpbmQoJyMnLCBo ZWFkZXJFbmQpOyBmcmFnbWVudEluSGVhZGVyICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICBzaXplX3QgZW5jb2RlZERhdGFTdGFydCA9IGhlYWRlckVuZCA9 PSBub3RGb3VuZCA/IGhlYWRlckVuZCA6IGhlYWRlckVuZCArIDE7CiAKLSAgICAgICAgZW5jb2Rl ZERhdGEgPSBTdHJpbmdWaWV3KHVybFN0cmluZykuc3Vic3RyaW5nKGVuY29kZWREYXRhU3RhcnQp OwotICAgICAgICBhdXRvIGhlYWRlciA9IFN0cmluZ1ZpZXcodXJsU3RyaW5nKS5zdWJzdHJpbmco aGVhZGVyU3RhcnQsIGhlYWRlckVuZCAtIGhlYWRlclN0YXJ0KTsKKyAgICAgICAgYXV0byBoZWFk ZXIgPSBTdHJpbmdWaWV3KHVybC5zdHJpbmcoKSkuc3Vic3RyaW5nKGhlYWRlclN0YXJ0LCBoZWFk ZXJFbmQgLSBoZWFkZXJTdGFydCk7CiAgICAgICAgIAogICAgICAgICAvLyBUaGVyZSBtaWdodCBv bmUgb3IgdHdvIHNlbWljb2xvbnMgaW4gdGhlIGhlYWRlciwgZmluZCB0aGUgbGFzdCBvbmUuCiAg ICAgICAgIHNpemVfdCBtZWRpYVR5cGVFbmQgPSBoZWFkZXIucmV2ZXJzZUZpbmQoJzsnKTsKQEAg LTEwMSwxMSArMTE5LDE2IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKG1lZGlhVHlwZS5zdGFydHNX aXRoKCc7JykpCiAgICAgICAgICAgICBtZWRpYVR5cGUuaW5zZXJ0KCJ0ZXh0L3BsYWluIiwgMCk7 CiAKKyAgICAgICAgaWYgKHNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcihtZWRpYVR5cGUp KQorICAgICAgICAgICAgdXJsLnJlbW92ZUZyYWdtZW50SWRlbnRpZmllcigpOworCisgICAgICAg IGVuY29kZWREYXRhID0gU3RyaW5nVmlldyh1cmwuc3RyaW5nKCkpLnN1YnN0cmluZyhlbmNvZGVk RGF0YVN0YXJ0KTsKKwogICAgICAgICByZXN1bHQgPSBwYXJzZU1lZGlhVHlwZShtZWRpYVR5cGUp OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBjb25zdCBTdHJpbmcgdXJsU3Ry aW5nOworICAgIFVSTCB1cmw7CiAgICAgU3RyaW5nVmlldyBlbmNvZGVkRGF0YTsKICAgICBib29s IGlzQmFzZTY0IHsgZmFsc2UgfTsKICAgICBjb25zdCBTY2hlZHVsZUNvbnRleHQgc2NoZWR1bGVD b250ZXh0OwpAQCAtMTE3LDcgKzE0MCw3IEBAIHB1YmxpYzoKIHN0YXRpYyBzdGQ6OnVuaXF1ZV9w dHI8RGVjb2RlVGFzaz4gY3JlYXRlRGVjb2RlVGFzayhjb25zdCBVUkwmIHVybCwgY29uc3QgU2No ZWR1bGVDb250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNvbXBsZXRpb25IYW5kbGVyJiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgcmV0dXJuIG1ha2VVbmlxdWU8RGVjb2RlVGFzaz4o Ci0gICAgICAgIHVybC5zdHJpbmcoKSwKKyAgICAgICAgdXJsLAogICAgICAgICBzY2hlZHVsZUNv bnRleHQsCiAgICAgICAgIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpCiAgICAgKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBjOGMwMzFlYjMxZmZjNjFhNjU3NGI4MThiYzg3OGQ4ZDEwNzljNmY3Li4wNTg2NDE0MGRmZjlh MDQ2NTkxMTk4OWMxYjZiMmM4MWI3ODE5N2Q1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAt MTItMDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAg ICAgICBQYXJzZSBjb250ZW50IGFmdGVyICMgaW4gZGF0YSBVUkxzIHdpdGggSExTIG1pbWUgdHlw ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTYx MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzEwMzkyODI+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBmYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5 cGUuaHRtbDogQWRkZWQuCisKIDIwMjAtMTItMDcgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy93ZWJhdWRpby90aGUtYXVkaW8tYXBpL3RoZS1jaGFubmVsbWVyZ2Vybm9kZS1pbnRlcmZh Y2UvYWN0aXZlLXByb2Nlc3NpbmcuaHR0cHMuaHRtbCBpcyBmbGFreSBmYWlsaW5nCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi43ZWI3NmY5ODdlNzQzYmY1MjhjM2JiYzM3Y2UwOGE4OGU1N2Y2YjNmCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK0FMRVJUOiB0ZXh0MQorQUxFUlQ6IHRleHQyI25v dGlnbm9yZWQKK0FMRVJUOiB0ZXh0MyNub3RpZ25vcmVkCitDT05TT0xFIE1FU1NBR0U6IEZldGNo IEFQSSBjYW5ub3QgbG9hZCBkYXRhOnRlI3h0L3BsYWluLHRleHQ0LgorQUxFUlQ6IGNhdWdodCBl cnJvciBmcm9tIGRhdGEgVVJMIHdpdGggIyBpbiBoZWFkZXIKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3VybC9kYXRhLXVybC1tZWRpYXR5cGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ZTA2YzQ3NWQwODAwZWE1 YWRjZDNkMjVkM2VmNzc4ODdiYzA5MmEwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPHNjcmlw dD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICB0ZXN0UnVubmVyLmR1bXBBc1Rl eHQoKTsKKyAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICB9CisKKyAgYXN5bmMg ZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgIGxldCByMSA9IGF3YWl0IGZldGNoKCJkYXRhOnRl eHQvcGxhaW4sdGV4dDEjaWdub3JlZCIpOworICAgICAgbGV0IHQxID0gYXdhaXQgcjEudGV4dCgp OworICAgICAgYWxlcnQodDEpOworCisgICAgICBsZXQgcjIgPSBhd2FpdCBmZXRjaCgiZGF0YTph dWRpby9tcGVnVVJMLHRleHQyI25vdGlnbm9yZWQiKTsKKyAgICAgIGxldCB0MiA9IGF3YWl0IHIy LnRleHQoKTsKKyAgICAgIGFsZXJ0KHQyKTsKKworICAgICAgbGV0IHIzID0gYXdhaXQgZmV0Y2go ImRhdGE6dmlkZW8vbXBlZ1VSTCx0ZXh0MyNub3RpZ25vcmVkIik7CisgICAgICBsZXQgdDMgPSBh d2FpdCByMy50ZXh0KCk7CisgICAgICBhbGVydCh0Myk7CisKKyAgICAgIHRyeSB7CisJICBhd2Fp dCBmZXRjaCgiZGF0YTp0ZSN4dC9wbGFpbix0ZXh0NCIpCisgICAgICB9IGNhdGNoIChlKSB7CisJ ICBhbGVydCgiY2F1Z2h0IGVycm9yIGZyb20gZGF0YSBVUkwgd2l0aCAjIGluIGhlYWRlciIpOwor ICAgICAgfQorCisgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsgdGVzdFJ1bm5lci5ub3Rp ZnlEb25lKCk7IH0KKyAgfQorICBydW5UZXN0KCk7Cis8L3NjcmlwdD4K 415588 2020-12-07 14:53:05 -0800 2020-12-07 14:57:34 -0800 Patch bug-219612-20201207145304.patch text/plain 9223 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5NTBmOTE5ZWNhMTA1 ZDk5Zjk2YWYzY2ExOTE5NjJhNDQ1M2ExZC4uMThhOTJkODk2NGFiNGIxZjc3OTA4YWQyYzFlNDIx Nzk0NjczZmU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTA3ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFyc2Ug Y29udGVudCBhZnRlciAjIGluIGRhdGEgVVJMcyB3aXRoIEhMUyBtaW1lIHR5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2MTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcxMDM5MjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIHIyNjc5OTUgbWFkZSB1cyBjb25mb3JtIHRvIHRoZSBiZWhhdmlvciBv ZiBDaHJvbWUgYW5kIEZpcmVmb3ggYnkgcmVtb3ZpbmcgZnJhZ21lbnRzIGZyb20gZGF0YSBVUkxz IGJlZm9yZSBwYXJzaW5nLgorICAgICAgICBXaGlsZSB0aGlzIGlzIGRlc2lyYWJsZSwgdGhlcmUg aXMgY29udGVudCBpbiBTYWZhcmktc3BlY2lmaWMgSExTIGRhdGEgVVJMcyB0aGF0IG5lZWRzIHRo ZSBjb250ZW50IGluY2x1ZGluZyBhbmQgYWZ0ZXIgIy4KKyAgICAgICAgU28sIHRvIGZpeCB0aGlz LCB3YWl0IHVudGlsIGFmdGVyIHdlIGtub3cgdGhlIG1pbWUgdHlwZSBhbmQgcmVtb3ZlIHRoZSBm cmFnbWVudCBpZiBpdCdzIG5vdCBITFMuCisKKyAgICAgICAgVGVzdDogZmFzdC91cmwvZGF0YS11 cmwtbWVkaWF0eXBlLmh0bWwKKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6c2hvdWxkU3RyaXBGcmFnbWVudElkZW50aWZpZXIpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVSTERlY29kZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YVVSTERlY29kZXI6OnNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcik6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6RGVjb2RlVGFzayk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6cHJvY2Vzcyk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6Y3JlYXRlRGVjb2RlVGFzayk6CisK IDIwMjAtMTItMDcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAg ICAgICBOb24tdW5pZmllZCBidWlsZCBmaXhlcywgZWFybHkgRGVjZW1iZXIgMjAyMCBlZGl0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAzMGIwOGE4ZGNl MWNkZmQyMmJhYmM0ZTgzM2FmNGNiOGRkZGJmZTdiLi5iMzU0ZTdhYWFmNzk1ZWE1ZjY3NGExMTJi NGRkZGQ1YTBlZDA4MWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5j cHAKQEAgLTU0LDEwICs1NCw2IEBACiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogCi0jaWYgUExBVEZPUk0oQ09DT0EpCi0jaW5jbHVkZSAi VmVyc2lvbkNoZWNrcy5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05T KQogI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgogI2VuZGlmCkBAIC0yNTIsMTUg KzI0OCw2IEBAIEZyYW1lTG9hZGVyKiBSZXNvdXJjZUxvYWRlcjo6ZnJhbWVMb2FkZXIoKSBjb25z dAogICAgIHJldHVybiAmbV9mcmFtZS0+bG9hZGVyKCk7CiB9CiAKLXN0YXRpYyBib29sIHNob3Vs ZFN0cmlwRnJhZ21lbnRJZGVudGlmaWVyKCkKLXsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBy ZXR1cm4gbGlua2VkT25PckFmdGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVu dFJlbW92YWwpOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbmRpZgotfQotCiB2b2lkIFJl c291cmNlTG9hZGVyOjpsb2FkRGF0YVVSTCgpCiB7CiAgICAgYXV0byB1cmwgPSBtX3JlcXVlc3Qu dXJsKCk7CkBAIC0yNzQsOCArMjYxLDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFV UkwoKQogICAgIGF1dG8gbW9kZSA9IERhdGFVUkxEZWNvZGVyOjpNb2RlOjpMZWdhY3k7CiAgICAg aWYgKG1fcmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6 RmV0Y2gpCiAgICAgICAgIG1vZGUgPSBEYXRhVVJMRGVjb2Rlcjo6TW9kZTo6Rm9yZ2l2aW5nQmFz ZTY0OwotICAgIGlmIChzaG91bGRTdHJpcEZyYWdtZW50SWRlbnRpZmllcigpKQotICAgICAgICB1 cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CiAgICAgRGF0YVVSTERlY29kZXI6OmRlY29k ZSh1cmwsIHNjaGVkdWxlQ29udGV4dCwgbW9kZSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgdXJsXShhdXRvIGRlY29kZVJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlm ICh0aGlzLT5yZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMRGVjb2Rlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApp bmRleCBkYmU3YTBmZGU2OTZiYjlmNmEzM2MwZTVjOTU0ODU0YzFhYzBmMTg1Li5jZThlNDZjMjU3 N2E5YmU4OWY5MmU0YTQ3NDljMzVjZWNhYzEyMTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApAQCAtMzgsOSArMzgsMjkgQEAK ICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0Lmg+ CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNsdWRlICJWZXJzaW9uQ2hlY2tzLmgiCisjZW5k aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERhdGFVUkxEZWNvZGVyIHsKIAor c3RhdGljIGJvb2wgc2hvdWxkUmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYg bWVkaWFUeXBlKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmICghbGlua2VkT25PckFm dGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVudFJlbW92YWwpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBITFMgdXNlcyAjIGluIHRoZSBtaWRkbGUgb2YgdGhl IG1hbmlmZXN0cy4KKyAgICByZXR1cm4gIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UobWVkaWFUeXBl LCAidmlkZW8vbXBlZ3VybCIpCisgICAgICAgICYmICFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG1l ZGlhVHlwZSwgImF1ZGlvL21wZWd1cmwiKQorICAgICAgICAmJiAhZXF1YWxJZ25vcmluZ0FTQ0lJ Q2FzZShtZWRpYVR5cGUsICJhcHBsaWNhdGlvbi94LW1wZWd1cmwiKQorICAgICAgICAmJiAhZXF1 YWxJZ25vcmluZ0FTQ0lJQ2FzZShtZWRpYVR5cGUsICJ2bmQuYXBwbGUubXBlZ3VybCIpOworI2Vs c2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKwogc3RhdGljIFdvcmtRdWV1ZSYgZGVj b2RlUXVldWUoKQogewogICAgIHN0YXRpYyBhdXRvJiBxdWV1ZSA9IFdvcmtRdWV1ZTo6Y3JlYXRl KCJvcmcud2Via2l0LkRhdGFVUkxEZWNvZGVyIiwgV29ya1F1ZXVlOjpUeXBlOjpTZXJpYWwsIFdv cmtRdWV1ZTo6UU9TOjpVc2VySW5pdGlhdGVkKS5sZWFrUmVmKCk7CkBAIC01Nyw4ICs3Nyw4IEBA IHN0YXRpYyBSZXN1bHQgcGFyc2VNZWRpYVR5cGUoY29uc3QgU3RyaW5nJiBtZWRpYVR5cGUpCiBz dHJ1Y3QgRGVjb2RlVGFzayB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6 Ci0gICAgRGVjb2RlVGFzayhjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU2NoZWR1bGVD b250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxl dGlvbkhhbmRsZXIpCi0gICAgICAgIDogdXJsU3RyaW5nKHVybFN0cmluZy5pc29sYXRlZENvcHko KSkKKyAgICBEZWNvZGVUYXNrKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTY2hlZHVsZUNvbnRleHQm IHNjaGVkdWxlQ29udGV4dCwgRGVjb2RlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFu ZGxlcikKKyAgICAgICAgOiB1cmwodXJsLmlzb2xhdGVkQ29weSgpKQogICAgICAgICAsIHNjaGVk dWxlQ29udGV4dChzY2hlZHVsZUNvbnRleHQpCiAgICAgICAgICwgY29tcGxldGlvbkhhbmRsZXIo V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCiAgICAgewpAQCAtNzEsMTggKzkxLDE4IEBAIHB1 YmxpYzoKICAgICAgICAgLy8gIGhlYWRlciA6PSBbPG1lZGlhdHlwZT5dWztiYXNlNjRdCiAgICAg ICAgIC8vICBtZWRpYXR5cGUgOj0gWzxtaW1ldHlwZT5dWztjaGFyc2V0PTxjaGFyc2V0dHlwZT5d CiAKLSAgICAgICAgaWYgKHVybFN0cmluZy5maW5kKCcsJykgPT0gbm90Rm91bmQpCi0gICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICAgICAgY29uc3QgY2hhciBkYXRhU3RyaW5nW10gPSAi ZGF0YToiOwotICAgICAgICBBU1NFUlQodXJsU3RyaW5nLnN0YXJ0c1dpdGgoZGF0YVN0cmluZykp OworICAgICAgICBBU1NFUlQodXJsLnN0cmluZygpLnN0YXJ0c1dpdGgoZGF0YVN0cmluZykpOwog CiAgICAgICAgIHNpemVfdCBoZWFkZXJTdGFydCA9IHN0cmxlbihkYXRhU3RyaW5nKTsKLSAgICAg ICAgc2l6ZV90IGhlYWRlckVuZCA9IHVybFN0cmluZy5maW5kKCcsJywgaGVhZGVyU3RhcnQpOwor ICAgICAgICBzaXplX3QgaGVhZGVyRW5kID0gdXJsLnN0cmluZygpLmZpbmQoJywnLCBoZWFkZXJT dGFydCk7CisgICAgICAgIGlmIChoZWFkZXJFbmQgPT0gbm90Rm91bmQpCisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChzaXplX3QgZnJhZ21lbnRJbkhlYWRlciA9IHVybC5z dHJpbmcoKS5yZXZlcnNlRmluZCgnIycsIGhlYWRlckVuZCk7IGZyYWdtZW50SW5IZWFkZXIgIT0g bm90Rm91bmQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHNpemVfdCBlbmNv ZGVkRGF0YVN0YXJ0ID0gaGVhZGVyRW5kID09IG5vdEZvdW5kID8gaGVhZGVyRW5kIDogaGVhZGVy RW5kICsgMTsKIAotICAgICAgICBlbmNvZGVkRGF0YSA9IFN0cmluZ1ZpZXcodXJsU3RyaW5nKS5z dWJzdHJpbmcoZW5jb2RlZERhdGFTdGFydCk7Ci0gICAgICAgIGF1dG8gaGVhZGVyID0gU3RyaW5n Vmlldyh1cmxTdHJpbmcpLnN1YnN0cmluZyhoZWFkZXJTdGFydCwgaGVhZGVyRW5kIC0gaGVhZGVy U3RhcnQpOworICAgICAgICBhdXRvIGhlYWRlciA9IFN0cmluZ1ZpZXcodXJsLnN0cmluZygpKS5z dWJzdHJpbmcoaGVhZGVyU3RhcnQsIGhlYWRlckVuZCAtIGhlYWRlclN0YXJ0KTsKICAgICAgICAg CiAgICAgICAgIC8vIFRoZXJlIG1pZ2h0IG9uZSBvciB0d28gc2VtaWNvbG9ucyBpbiB0aGUgaGVh ZGVyLCBmaW5kIHRoZSBsYXN0IG9uZS4KICAgICAgICAgc2l6ZV90IG1lZGlhVHlwZUVuZCA9IGhl YWRlci5yZXZlcnNlRmluZCgnOycpOwpAQCAtMTAxLDExICsxMjEsMTYgQEAgcHVibGljOgogICAg ICAgICBpZiAobWVkaWFUeXBlLnN0YXJ0c1dpdGgoJzsnKSkKICAgICAgICAgICAgIG1lZGlhVHlw ZS5pbnNlcnQoInRleHQvcGxhaW4iLCAwKTsKIAorICAgICAgICBpZiAoc2hvdWxkUmVtb3ZlRnJh Z21lbnRJZGVudGlmaWVyKG1lZGlhVHlwZSkpCisgICAgICAgICAgICB1cmwucmVtb3ZlRnJhZ21l bnRJZGVudGlmaWVyKCk7CisKKyAgICAgICAgZW5jb2RlZERhdGEgPSBTdHJpbmdWaWV3KHVybC5z dHJpbmcoKSkuc3Vic3RyaW5nKGVuY29kZWREYXRhU3RhcnQpOworCiAgICAgICAgIHJlc3VsdCA9 IHBhcnNlTWVkaWFUeXBlKG1lZGlhVHlwZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IAotICAgIGNvbnN0IFN0cmluZyB1cmxTdHJpbmc7CisgICAgVVJMIHVybDsKICAgICBTdHJpbmdW aWV3IGVuY29kZWREYXRhOwogICAgIGJvb2wgaXNCYXNlNjQgeyBmYWxzZSB9OwogICAgIGNvbnN0 IFNjaGVkdWxlQ29udGV4dCBzY2hlZHVsZUNvbnRleHQ7CkBAIC0xMTcsNyArMTQyLDcgQEAgcHVi bGljOgogc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVUYXNrPiBjcmVhdGVEZWNvZGVUYXNr KGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTY2hlZHVsZUNvbnRleHQmIHNjaGVkdWxlQ29udGV4dCwg RGVjb2RlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICByZXR1 cm4gbWFrZVVuaXF1ZTxEZWNvZGVUYXNrPigKLSAgICAgICAgdXJsLnN0cmluZygpLAorICAgICAg ICB1cmwsCiAgICAgICAgIHNjaGVkdWxlQ29udGV4dCwKICAgICAgICAgV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcikKICAgICApOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM4YzAzMWViMzFmZmM2MWE2NTc0YjgxOGJjODc4 ZDhkMTA3OWM2ZjcuLjA1ODY0MTQwZGZmOWEwNDY1OTExOTg5YzFiNmIyYzgxYjc4MTk3ZDUgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0xMi0wNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFBhcnNlIGNvbnRlbnQgYWZ0ZXIgIyBpbiBk YXRhIFVSTHMgd2l0aCBITFMgbWltZSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NjEyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MTAz OTI4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIGZh c3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGZhc3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS5odG1sOiBBZGRlZC4KKwogMjAyMC0xMi0wNyAg TGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYmF1ZGlvL3RoZS1hdWRpby1hcGkvdGhl LWNoYW5uZWxtZXJnZXJub2RlLWludGVyZmFjZS9hY3RpdmUtcHJvY2Vzc2luZy5odHRwcy5odG1s IGlzIGZsYWt5IGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdXJsL2RhdGEt dXJsLW1lZGlhdHlwZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVy bC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJmODgzYzU0NzFjNWE3YWNhNzY0 OTA5MGE1NDI4YzEyN2Y3ZmUzMDYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorQUxF UlQ6IGF1ZGlvL21wZWdVUkwgdGV4dCNmcmFnbWVudAorQUxFUlQ6IHZpZGVvL21wZWdVUkwgdGV4 dCNmcmFnbWVudAorQUxFUlQ6IGFwcGxpY2F0aW9uL3gtbXBlZ3VybCB0ZXh0I2ZyYWdtZW50CitB TEVSVDogdm5kLmFwcGxlLm1wZWd1cmwgdGV4dCNmcmFnbWVudAorQUxFUlQ6IHRleHQvcGxhaW4g dGV4dAorQ09OU09MRSBNRVNTQUdFOiBGZXRjaCBBUEkgY2Fubm90IGxvYWQgZGF0YTp0ZSN4dC9w bGFpbix0ZXh0I2ZyYWdtZW50LgorQUxFUlQ6IGNhdWdodCBlcnJvciB3aXRoIG1pbWUgdHlwZSB0 ZSN4dC9wbGFpbgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVybC1t ZWRpYXR5cGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdXJsL2RhdGEtdXJsLW1lZGlhdHlwZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjcwMTFjMzQ4YTY0NDc3NGRhYTUwNWM3Yjk4YmZiMDBkMDUzYzBhNTYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5 cGUuaHRtbApAQCAtMCwwICsxLDI4IEBACis8c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5u ZXIpIHsKKyAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgdGVzdFJ1bm5lci53 YWl0VW50aWxEb25lKCk7CisgIH0KKworICBhc3luYyBmdW5jdGlvbiBydW5UZXN0KCkgeworICAg ICAgY29uc3QgbWltZVR5cGVzID0gWworICAgICAgICAgICJhdWRpby9tcGVnVVJMIiwKKyAgICAg ICAgICAidmlkZW8vbXBlZ1VSTCIsCisgICAgICAgICAgImFwcGxpY2F0aW9uL3gtbXBlZ3VybCIs CisgICAgICAgICAgInZuZC5hcHBsZS5tcGVndXJsIiwKKyAgICAgICAgICAidGV4dC9wbGFpbiIs CisgICAgICAgICAgInRlI3h0L3BsYWluIgorICAgICAgXTsKKyAgICAgIGZvciAoY29uc3QgbWlt ZVR5cGUgb2YgbWltZVR5cGVzKSB7CisJICB0cnkgeworICAgICAgICAgICAgICBsZXQgcmVzcG9u c2UgPSBhd2FpdCBmZXRjaCgiZGF0YToiICsgbWltZVR5cGUgKyAiLHRleHQjZnJhZ21lbnQiKTsK KyAgICAgICAgICAgICAgbGV0IHRleHQgPSBhd2FpdCByZXNwb25zZS50ZXh0KCk7CisgICAgICAg ICAgICAgIGFsZXJ0KG1pbWVUeXBlICsgIiAiICsgdGV4dCk7CisJICB9IGNhdGNoIChlKSB7CisJ ICAgICAgYWxlcnQoImNhdWdodCBlcnJvciB3aXRoIG1pbWUgdHlwZSAiICsgbWltZVR5cGUpOwor CSAgfQorICAgICAgfQorICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7IHRlc3RSdW5uZXIu bm90aWZ5RG9uZSgpOyB9CisgIH0KKyAgcnVuVGVzdCgpOworPC9zY3JpcHQ+Cg== 415591 2020-12-07 14:57:35 -0800 2020-12-07 18:02:27 -0800 Patch bug-219612-20201207145735.patch text/plain 9251 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5NTBmOTE5ZWNhMTA1 ZDk5Zjk2YWYzY2ExOTE5NjJhNDQ1M2ExZC4uMThhOTJkODk2NGFiNGIxZjc3OTA4YWQyYzFlNDIx Nzk0NjczZmU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTA3ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFyc2Ug Y29udGVudCBhZnRlciAjIGluIGRhdGEgVVJMcyB3aXRoIEhMUyBtaW1lIHR5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2MTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcxMDM5MjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIHIyNjc5OTUgbWFkZSB1cyBjb25mb3JtIHRvIHRoZSBiZWhhdmlvciBv ZiBDaHJvbWUgYW5kIEZpcmVmb3ggYnkgcmVtb3ZpbmcgZnJhZ21lbnRzIGZyb20gZGF0YSBVUkxz IGJlZm9yZSBwYXJzaW5nLgorICAgICAgICBXaGlsZSB0aGlzIGlzIGRlc2lyYWJsZSwgdGhlcmUg aXMgY29udGVudCBpbiBTYWZhcmktc3BlY2lmaWMgSExTIGRhdGEgVVJMcyB0aGF0IG5lZWRzIHRo ZSBjb250ZW50IGluY2x1ZGluZyBhbmQgYWZ0ZXIgIy4KKyAgICAgICAgU28sIHRvIGZpeCB0aGlz LCB3YWl0IHVudGlsIGFmdGVyIHdlIGtub3cgdGhlIG1pbWUgdHlwZSBhbmQgcmVtb3ZlIHRoZSBm cmFnbWVudCBpZiBpdCdzIG5vdCBITFMuCisKKyAgICAgICAgVGVzdDogZmFzdC91cmwvZGF0YS11 cmwtbWVkaWF0eXBlLmh0bWwKKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6c2hvdWxkU3RyaXBGcmFnbWVudElkZW50aWZpZXIpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVSTERlY29kZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YVVSTERlY29kZXI6OnNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcik6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6RGVjb2RlVGFzayk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6RGVjb2RlVGFzazo6cHJvY2Vzcyk6 CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMRGVjb2Rlcjo6Y3JlYXRlRGVjb2RlVGFzayk6CisK IDIwMjAtMTItMDcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAg ICAgICBOb24tdW5pZmllZCBidWlsZCBmaXhlcywgZWFybHkgRGVjZW1iZXIgMjAyMCBlZGl0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAzMGIwOGE4ZGNl MWNkZmQyMmJhYmM0ZTgzM2FmNGNiOGRkZGJmZTdiLi5iMzU0ZTdhYWFmNzk1ZWE1ZjY3NGExMTJi NGRkZGQ1YTBlZDA4MWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5j cHAKQEAgLTU0LDEwICs1NCw2IEBACiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogCi0jaWYgUExBVEZPUk0oQ09DT0EpCi0jaW5jbHVkZSAi VmVyc2lvbkNoZWNrcy5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05T KQogI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgogI2VuZGlmCkBAIC0yNTIsMTUg KzI0OCw2IEBAIEZyYW1lTG9hZGVyKiBSZXNvdXJjZUxvYWRlcjo6ZnJhbWVMb2FkZXIoKSBjb25z dAogICAgIHJldHVybiAmbV9mcmFtZS0+bG9hZGVyKCk7CiB9CiAKLXN0YXRpYyBib29sIHNob3Vs ZFN0cmlwRnJhZ21lbnRJZGVudGlmaWVyKCkKLXsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBy ZXR1cm4gbGlua2VkT25PckFmdGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVu dFJlbW92YWwpOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbmRpZgotfQotCiB2b2lkIFJl c291cmNlTG9hZGVyOjpsb2FkRGF0YVVSTCgpCiB7CiAgICAgYXV0byB1cmwgPSBtX3JlcXVlc3Qu dXJsKCk7CkBAIC0yNzQsOCArMjYxLDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6bG9hZERhdGFV UkwoKQogICAgIGF1dG8gbW9kZSA9IERhdGFVUkxEZWNvZGVyOjpNb2RlOjpMZWdhY3k7CiAgICAg aWYgKG1fcmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6 RmV0Y2gpCiAgICAgICAgIG1vZGUgPSBEYXRhVVJMRGVjb2Rlcjo6TW9kZTo6Rm9yZ2l2aW5nQmFz ZTY0OwotICAgIGlmIChzaG91bGRTdHJpcEZyYWdtZW50SWRlbnRpZmllcigpKQotICAgICAgICB1 cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CiAgICAgRGF0YVVSTERlY29kZXI6OmRlY29k ZSh1cmwsIHNjaGVkdWxlQ29udGV4dCwgbW9kZSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgdXJsXShhdXRvIGRlY29kZVJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlm ICh0aGlzLT5yZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMRGVjb2Rlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApp bmRleCBkYmU3YTBmZGU2OTZiYjlmNmEzM2MwZTVjOTU0ODU0YzFhYzBmMTg1Li4xYjVmOGU2YWZi ZTNjMzhlNmY1NzhhNzRjNjg5MWJkY2YyMDVjMWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkxEZWNvZGVyLmNwcApAQCAtMzgsOSArMzgsMjkgQEAK ICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0Lmg+ CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNsdWRlICJWZXJzaW9uQ2hlY2tzLmgiCisjZW5k aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERhdGFVUkxEZWNvZGVyIHsKIAor c3RhdGljIGJvb2wgc2hvdWxkUmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYg bWVkaWFUeXBlKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmICghbGlua2VkT25PckFm dGVyKFNES1ZlcnNpb246OkZpcnN0V2l0aERhdGFVUkxGcmFnbWVudFJlbW92YWwpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBITFMgdXNlcyAjIGluIHRoZSBtaWRkbGUgb2YgdGhl IG1hbmlmZXN0cy4KKyAgICByZXR1cm4gIWVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1l ZGlhVHlwZSwgInZpZGVvL21wZWd1cmwiKQorICAgICAgICAmJiAhZXF1YWxMZXR0ZXJzSWdub3Jp bmdBU0NJSUNhc2UobWVkaWFUeXBlLCAiYXVkaW8vbXBlZ3VybCIpCisgICAgICAgICYmICFlcXVh bExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShtZWRpYVR5cGUsICJhcHBsaWNhdGlvbi94LW1wZWd1 cmwiKQorICAgICAgICAmJiAhZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobWVkaWFUeXBl LCAidm5kLmFwcGxlLm1wZWd1cmwiKTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlm Cit9CisKIHN0YXRpYyBXb3JrUXVldWUmIGRlY29kZVF1ZXVlKCkKIHsKICAgICBzdGF0aWMgYXV0 byYgcXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgib3JnLndlYmtpdC5EYXRhVVJMRGVjb2RlciIs IFdvcmtRdWV1ZTo6VHlwZTo6U2VyaWFsLCBXb3JrUXVldWU6OlFPUzo6VXNlckluaXRpYXRlZCku bGVha1JlZigpOwpAQCAtNTcsOCArNzcsOCBAQCBzdGF0aWMgUmVzdWx0IHBhcnNlTWVkaWFUeXBl KGNvbnN0IFN0cmluZyYgbWVkaWFUeXBlKQogc3RydWN0IERlY29kZVRhc2sgewogICAgIFdURl9N QUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIERlY29kZVRhc2soY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcsIGNvbnN0IFNjaGVkdWxlQ29udGV4dCYgc2NoZWR1bGVDb250ZXh0LCBEZWNv ZGVDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQotICAgICAgICA6IHVybFN0 cmluZyh1cmxTdHJpbmcuaXNvbGF0ZWRDb3B5KCkpCisgICAgRGVjb2RlVGFzayhjb25zdCBVUkwm IHVybCwgY29uc3QgU2NoZWR1bGVDb250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNvbXBs ZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgIDogdXJsKHVybC5pc29s YXRlZENvcHkoKSkKICAgICAgICAgLCBzY2hlZHVsZUNvbnRleHQoc2NoZWR1bGVDb250ZXh0KQog ICAgICAgICAsIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKQog ICAgIHsKQEAgLTcxLDE4ICs5MSwxOCBAQCBwdWJsaWM6CiAgICAgICAgIC8vICBoZWFkZXIgOj0g WzxtZWRpYXR5cGU+XVs7YmFzZTY0XQogICAgICAgICAvLyAgbWVkaWF0eXBlIDo9IFs8bWltZXR5 cGU+XVs7Y2hhcnNldD08Y2hhcnNldHR5cGU+XQogCi0gICAgICAgIGlmICh1cmxTdHJpbmcuZmlu ZCgnLCcpID09IG5vdEZvdW5kKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgICAg IGNvbnN0IGNoYXIgZGF0YVN0cmluZ1tdID0gImRhdGE6IjsKLSAgICAgICAgQVNTRVJUKHVybFN0 cmluZy5zdGFydHNXaXRoKGRhdGFTdHJpbmcpKTsKKyAgICAgICAgQVNTRVJUKHVybC5zdHJpbmco KS5zdGFydHNXaXRoKGRhdGFTdHJpbmcpKTsKIAogICAgICAgICBzaXplX3QgaGVhZGVyU3RhcnQg PSBzdHJsZW4oZGF0YVN0cmluZyk7Ci0gICAgICAgIHNpemVfdCBoZWFkZXJFbmQgPSB1cmxTdHJp bmcuZmluZCgnLCcsIGhlYWRlclN0YXJ0KTsKKyAgICAgICAgc2l6ZV90IGhlYWRlckVuZCA9IHVy bC5zdHJpbmcoKS5maW5kKCcsJywgaGVhZGVyU3RhcnQpOworICAgICAgICBpZiAoaGVhZGVyRW5k ID09IG5vdEZvdW5kKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoc2l6 ZV90IGZyYWdtZW50SW5IZWFkZXIgPSB1cmwuc3RyaW5nKCkucmV2ZXJzZUZpbmQoJyMnLCBoZWFk ZXJFbmQpOyBmcmFnbWVudEluSGVhZGVyICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgICAgICBzaXplX3QgZW5jb2RlZERhdGFTdGFydCA9IGhlYWRlckVuZCA9PSBu b3RGb3VuZCA/IGhlYWRlckVuZCA6IGhlYWRlckVuZCArIDE7CiAKLSAgICAgICAgZW5jb2RlZERh dGEgPSBTdHJpbmdWaWV3KHVybFN0cmluZykuc3Vic3RyaW5nKGVuY29kZWREYXRhU3RhcnQpOwot ICAgICAgICBhdXRvIGhlYWRlciA9IFN0cmluZ1ZpZXcodXJsU3RyaW5nKS5zdWJzdHJpbmcoaGVh ZGVyU3RhcnQsIGhlYWRlckVuZCAtIGhlYWRlclN0YXJ0KTsKKyAgICAgICAgYXV0byBoZWFkZXIg PSBTdHJpbmdWaWV3KHVybC5zdHJpbmcoKSkuc3Vic3RyaW5nKGhlYWRlclN0YXJ0LCBoZWFkZXJF bmQgLSBoZWFkZXJTdGFydCk7CiAgICAgICAgIAogICAgICAgICAvLyBUaGVyZSBtaWdodCBvbmUg b3IgdHdvIHNlbWljb2xvbnMgaW4gdGhlIGhlYWRlciwgZmluZCB0aGUgbGFzdCBvbmUuCiAgICAg ICAgIHNpemVfdCBtZWRpYVR5cGVFbmQgPSBoZWFkZXIucmV2ZXJzZUZpbmQoJzsnKTsKQEAgLTEw MSwxMSArMTIxLDE2IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKG1lZGlhVHlwZS5zdGFydHNXaXRo KCc7JykpCiAgICAgICAgICAgICBtZWRpYVR5cGUuaW5zZXJ0KCJ0ZXh0L3BsYWluIiwgMCk7CiAK KyAgICAgICAgaWYgKHNob3VsZFJlbW92ZUZyYWdtZW50SWRlbnRpZmllcihtZWRpYVR5cGUpKQor ICAgICAgICAgICAgdXJsLnJlbW92ZUZyYWdtZW50SWRlbnRpZmllcigpOworCisgICAgICAgIGVu Y29kZWREYXRhID0gU3RyaW5nVmlldyh1cmwuc3RyaW5nKCkpLnN1YnN0cmluZyhlbmNvZGVkRGF0 YVN0YXJ0KTsKKwogICAgICAgICByZXN1bHQgPSBwYXJzZU1lZGlhVHlwZShtZWRpYVR5cGUpOwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBjb25zdCBTdHJpbmcgdXJsU3RyaW5n OworICAgIFVSTCB1cmw7CiAgICAgU3RyaW5nVmlldyBlbmNvZGVkRGF0YTsKICAgICBib29sIGlz QmFzZTY0IHsgZmFsc2UgfTsKICAgICBjb25zdCBTY2hlZHVsZUNvbnRleHQgc2NoZWR1bGVDb250 ZXh0OwpAQCAtMTE3LDcgKzE0Miw3IEBAIHB1YmxpYzoKIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8 RGVjb2RlVGFzaz4gY3JlYXRlRGVjb2RlVGFzayhjb25zdCBVUkwmIHVybCwgY29uc3QgU2NoZWR1 bGVDb250ZXh0JiBzY2hlZHVsZUNvbnRleHQsIERlY29kZUNvbXBsZXRpb25IYW5kbGVyJiYgY29t cGxldGlvbkhhbmRsZXIpCiB7CiAgICAgcmV0dXJuIG1ha2VVbmlxdWU8RGVjb2RlVGFzaz4oCi0g ICAgICAgIHVybC5zdHJpbmcoKSwKKyAgICAgICAgdXJsLAogICAgICAgICBzY2hlZHVsZUNvbnRl eHQsCiAgICAgICAgIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpCiAgICAgKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBj OGMwMzFlYjMxZmZjNjFhNjU3NGI4MThiYzg3OGQ4ZDEwNzljNmY3Li4wNTg2NDE0MGRmZjlhMDQ2 NTkxMTk4OWMxYjZiMmM4MWI3ODE5N2Q1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTIt MDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAg ICBQYXJzZSBjb250ZW50IGFmdGVyICMgaW4gZGF0YSBVUkxzIHdpdGggSExTIG1pbWUgdHlwZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTYxMgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzEwMzkyODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBmYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUu aHRtbDogQWRkZWQuCisKIDIwMjAtMTItMDcgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJhdWRpby90aGUtYXVkaW8tYXBpL3RoZS1jaGFubmVsbWVyZ2Vybm9kZS1pbnRlcmZhY2Uv YWN0aXZlLXByb2Nlc3NpbmcuaHR0cHMuaHRtbCBpcyBmbGFreSBmYWlsaW5nCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5iZjg4M2M1NDcxYzVhN2FjYTc2NDkwOTBhNTQyOGMxMjdmN2ZlMzA2Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDggQEAKK0FMRVJUOiBhdWRpby9tcGVnVVJMIHRleHQjZnJhZ21l bnQKK0FMRVJUOiB2aWRlby9tcGVnVVJMIHRleHQjZnJhZ21lbnQKK0FMRVJUOiBhcHBsaWNhdGlv bi94LW1wZWd1cmwgdGV4dCNmcmFnbWVudAorQUxFUlQ6IHZuZC5hcHBsZS5tcGVndXJsIHRleHQj ZnJhZ21lbnQKK0FMRVJUOiB0ZXh0L3BsYWluIHRleHQKK0NPTlNPTEUgTUVTU0FHRTogRmV0Y2gg QVBJIGNhbm5vdCBsb2FkIGRhdGE6dGUjeHQvcGxhaW4sdGV4dCNmcmFnbWVudC4KK0FMRVJUOiBj YXVnaHQgZXJyb3Igd2l0aCBtaW1lIHR5cGUgdGUjeHQvcGxhaW4KKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L3VybC9kYXRhLXVybC1tZWRpYXR5cGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MDExYzM0OGE2NDQ3 NzRkYWE1MDVjN2I5OGJmYjAwZDA1M2MwYTU2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC91cmwvZGF0YS11cmwtbWVkaWF0eXBlLmh0bWwKQEAgLTAsMCArMSwyOCBAQAorPHNj cmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICB0ZXN0UnVubmVyLmR1bXBB c1RleHQoKTsKKyAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICB9CisKKyAgYXN5 bmMgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgIGNvbnN0IG1pbWVUeXBlcyA9IFsKKyAgICAg ICAgICAiYXVkaW8vbXBlZ1VSTCIsCisgICAgICAgICAgInZpZGVvL21wZWdVUkwiLAorICAgICAg ICAgICJhcHBsaWNhdGlvbi94LW1wZWd1cmwiLAorICAgICAgICAgICJ2bmQuYXBwbGUubXBlZ3Vy bCIsCisgICAgICAgICAgInRleHQvcGxhaW4iLAorICAgICAgICAgICJ0ZSN4dC9wbGFpbiIKKyAg ICAgIF07CisgICAgICBmb3IgKGNvbnN0IG1pbWVUeXBlIG9mIG1pbWVUeXBlcykgeworCSAgdHJ5 IHsKKyAgICAgICAgICAgICAgbGV0IHJlc3BvbnNlID0gYXdhaXQgZmV0Y2goImRhdGE6IiArIG1p bWVUeXBlICsgIix0ZXh0I2ZyYWdtZW50Iik7CisgICAgICAgICAgICAgIGxldCB0ZXh0ID0gYXdh aXQgcmVzcG9uc2UudGV4dCgpOworICAgICAgICAgICAgICBhbGVydChtaW1lVHlwZSArICIgIiAr IHRleHQpOworCSAgfSBjYXRjaCAoZSkgeworCSAgICAgIGFsZXJ0KCJjYXVnaHQgZXJyb3Igd2l0 aCBtaW1lIHR5cGUgIiArIG1pbWVUeXBlKTsKKwkgIH0KKyAgICAgIH0KKyAgICAgIGlmICh3aW5k b3cudGVzdFJ1bm5lcikgeyB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsgfQorICB9CisgIHJ1blRl c3QoKTsKKzwvc2NyaXB0Pgo=