222233 2021-02-20 12:30:57 -0800 [macOS] Crash under AuxiliaryProcess::initializeSandbox 2021-02-23 10:54:03 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=220358 InRadar P2 Normal --- 222324 1 pvollan pvollan ap bfulgham cdumez commit-queue ddkilzer sam webkit-bug-importer oldest_to_newest 1731831 0 pvollan 2021-02-20 12:30:57 -0800 When a WebKit client provides a user directory suffix in the process initialization parameters, confstr with the new user suffix applied will fail to create the full directory path if it does not exist, and return an empty result. This will lead to empty paths in the sandbox parameters, which will cause the sandbox to fail to compile, which will eventually crash the WebKit process. 1731833 1 pvollan 2021-02-20 12:33:38 -0800 <rdar://problem/74261611> 1731836 2 421102 pvollan 2021-02-20 12:37:09 -0800 Created attachment 421102 Patch 1731845 3 421102 ap 2021-02-20 13:04:34 -0800 Comment on attachment 421102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421102&action=review > Source/WebKit/ChangeLog:13 > + eventually crash the WebKit process. This patch addresses this by making sure the confstr temp and cache directories > + exist before calling confstr. Additionally, this patch reverts r271417, which was the first attempt at fixing this What does the path end up being? I'm very skeptical about respecting attacker provided paths in the suffix, for security and overall sanity reasons. 1731847 4 pvollan 2021-02-20 13:20:19 -0800 (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 421102 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421102&action=review > > > Source/WebKit/ChangeLog:13 > > + eventually crash the WebKit process. This patch addresses this by making sure the confstr temp and cache directories > > + exist before calling confstr. Additionally, this patch reverts r271417, which was the first attempt at fixing this > > What does the path end up being? I'm very skeptical about respecting > attacker provided paths in the suffix, for security and overall sanity > reasons. For example, the cache patch can be: /var/folders/dd/wjn_0cz5593389p25ybpbml00000gn/C/com.apple.mediaremoted/com.apple.WebKit.Networking This is when the client specifies the user dir suffix 'com.apple.mediaremoted'. All paths will be under the confstr base path (/var/folders/dd/wjn_0cz5593389p25ybpbml00000gn/C for the cache path). The WebKit client is only allowed to specify the user suffix, which will be appended to the base confstr path, so it is not possible for any client to use this to gain read and write access to arbitrary paths in the WebContent process. Thanks for reviewing! 1731857 5 421102 bfulgham 2021-02-20 14:21:53 -0800 Comment on attachment 421102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421102&action=review > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:671 > + setenv("DIRHELPER_USER_DIR_SUFFIX", FileSystem::fileSystemRepresentation(sandboxParameters.userDirectorySuffix()).data(), 1); I assume this is the bit of the old change being reverted? 1731858 6 421112 pvollan 2021-02-20 14:23:41 -0800 Created attachment 421112 Patch 1731859 7 pvollan 2021-02-20 14:24:32 -0800 (In reply to Brent Fulgham from comment #5) > Comment on attachment 421102 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421102&action=review > > > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:671 > > + setenv("DIRHELPER_USER_DIR_SUFFIX", FileSystem::fileSystemRepresentation(sandboxParameters.userDirectorySuffix()).data(), 1); > > I assume this is the bit of the old change being reverted? Yes. Thanks for reviewing! 1731875 8 421112 ap 2021-02-20 15:10:23 -0800 Comment on attachment 421112 Patch This is exactly what I repeatedly said was unacceptable, no? 1731879 9 421118 pvollan 2021-02-20 15:40:35 -0800 Created attachment 421118 Patch 1731881 10 421118 ap 2021-02-20 15:46:56 -0800 Comment on attachment 421118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421118&action=review > Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:-129 > - if (!isClientSandboxed()) { > - String userDirectorySuffix = xpc_dictionary_get_string(extraDataInitializationDataObject, "user-directory-suffix"); > - if (!userDirectorySuffix.isEmpty()) > - extraInitializationData.add("user-directory-suffix"_s, userDirectorySuffix); > - } > - Hmm, this was added for a reason (see svn blame). 1731887 11 421120 pvollan 2021-02-20 16:40:35 -0800 Created attachment 421120 Patch 1731889 12 421121 pvollan 2021-02-20 16:44:42 -0800 Created attachment 421121 Patch 1732020 13 421121 sam 2021-02-21 17:52:54 -0800 Comment on attachment 421121 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421121&action=review > Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp:66 > +#if PLATFORM(COCOA) > + String bundleID = WebCore::applicationBundleIdentifier(); > + return bundleID == "com.apple.WebKit.TestWebKitAPI"_s || bundleID == "com.apple.WebKit.WebKitTestRunner"_s; > +#else > + return false; > +#endif Rather than making this based on bundle ID, I think we should add SPI to enable this behavior. Hard coding bundle IDs when we don't need to tends to bite us in the long run when we add something else that needs it. 1732107 14 421183 pvollan 2021-02-22 06:08:53 -0800 Created attachment 421183 Patch 1732110 15 pvollan 2021-02-22 06:19:31 -0800 (In reply to Sam Weinig from comment #13) > Comment on attachment 421121 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421121&action=review > > > Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp:66 > > +#if PLATFORM(COCOA) > > + String bundleID = WebCore::applicationBundleIdentifier(); > > + return bundleID == "com.apple.WebKit.TestWebKitAPI"_s || bundleID == "com.apple.WebKit.WebKitTestRunner"_s; > > +#else > > + return false; > > +#endif > > Rather than making this based on bundle ID, I think we should add SPI to > enable this behavior. Hard coding bundle IDs when we don't need to tends to > bite us in the long run when we add something else that needs it. That is a good point. I wonder though, if we should try to avoid having the UI process have any control over the decision to allow overriding the user directory suffix. I have made a new patch, where the decision is made in the WebKit process, based on whether WebKit is running in a testing context. This should prevent the client from having control over the decision. What do you think? Thanks for reviewing! 1732111 16 421184 pvollan 2021-02-22 06:23:54 -0800 Created attachment 421184 Patch 1732174 17 421184 ap 2021-02-22 09:53:57 -0800 Comment on attachment 421184 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421184&action=review > Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:140 > + // directories of the WebKit process. The WebKit test clients are not sandboxed, and are not running tests against system WebKit, > + // which can be used to determine if this should be allowed. Is it right to intentionally prevent the ability to run tests against system WebKit? Honestly, I don't even fully understand what "platform binary" is, and whether tested WebKit ever becomes one under any internal scenarios (let's not discuss the answer here, though). But stepping back, I still struggle with understanding what the issue is. Did we confirm that it was actually mediaremoted using WebKit (why)? That one is indeed not sandboxed, but IIRC that's not what we are seeing in crash logs as responsible process. Seeing that we only use the directory suffix for unsandboxed processes, doing things based on it is not a security problem I thought it was. Maybe creating the directory structure is not so bad. But the root cause of the problem is not that the client isn't sufficiently trusted, but that it's passing a path as a suffix. Perhaps we should fix exactly that? Something like: - Ignore user-directory-suffix it it contains "/". - Put it into system log that we are ignoring it. What do you think? 1732177 18 421121 bfulgham 2021-02-22 09:56:22 -0800 Comment on attachment 421121 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421121&action=review > Source/WebKit/ChangeLog:17 > + which was the first attempt at fixing this crash, but was unsuccessful in doing so. If creating these custom directories is only ever used by our test infrastructure, I wonder if we should require our test harness to create the directories. WebContent process could set the user directory suffix and attempt to use it, but would be unable to make file system changes. What if we simply crashed with a meaningful error message if we attempt to set user directory suffix? 1732182 19 421184 bfulgham 2021-02-22 10:07:40 -0800 Comment on attachment 421184 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421184&action=review >> Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:140 >> + // which can be used to determine if this should be allowed. > > Is it right to intentionally prevent the ability to run tests against system WebKit? Honestly, I don't even fully understand what "platform binary" is, and whether tested WebKit ever becomes one under any internal scenarios (let's not discuss the answer here, though). > > But stepping back, I still struggle with understanding what the issue is. Did we confirm that it was actually mediaremoted using WebKit (why)? That one is indeed not sandboxed, but IIRC that's not what we are seeing in crash logs as responsible process. > > Seeing that we only use the directory suffix for unsandboxed processes, doing things based on it is not a security problem I thought it was. Maybe creating the directory structure is not so bad. But the root cause of the problem is not that the client isn't sufficiently trusted, but that it's passing a path as a suffix. Perhaps we should fix exactly that? > > Something like: > - Ignore user-directory-suffix it it contains "/". > - Put it into system log that we are ignoring it. > > What do you think? Can you explain what you mean by ignoring u-d-s if it contains '/'? Do you mean we only want a suffix that cannot traverse directories (e.g., "dogfood" is okay, but "dogfood/test" is not)? If so, I think that sounds like a good plan. 1732184 20 pvollan 2021-02-22 10:12:43 -0800 (In reply to Alexey Proskuryakov from comment #17) > Comment on attachment 421184 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421184&action=review > > > Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:140 > > + // directories of the WebKit process. The WebKit test clients are not sandboxed, and are not running tests against system WebKit, > > + // which can be used to determine if this should be allowed. > > Is it right to intentionally prevent the ability to run tests against system > WebKit? Honestly, I don't even fully understand what "platform binary" is, > and whether tested WebKit ever becomes one under any internal scenarios > (let's not discuss the answer here, though). > This patch will not prevent you from running tests with system WebKit. It will just not share the confstr temp and cache paths between the UI process and the WebKit processes, which should not cause any issues. I should perhaps have chosen a different name. What I meant to say was whether the WebKit process was system WebKit or not. During testing this will not be the case, since we are testing a locally built WebKit which is not located in the system directory. > But stepping back, I still struggle with understanding what the issue is. > Did we confirm that it was actually mediaremoted using WebKit (why)? That > one is indeed not sandboxed, but IIRC that's not what we are seeing in crash > logs as responsible process. > Yes, I am quite confident that this is the case, but I am not sure why it does not show up in the crash log as responsible process. > Seeing that we only use the directory suffix for unsandboxed processes, > doing things based on it is not a security problem I thought it was. Maybe > creating the directory structure is not so bad. But the root cause of the > problem is not that the client isn't sufficiently trusted, but that it's > passing a path as a suffix. Perhaps we should fix exactly that? > > Something like: > - Ignore user-directory-suffix it it contains "/". > - Put it into system log that we are ignoring it. > > What do you think? The client is actually never passing a suffix containing a path. It is actually us that create the path :) For example, if the client passes the suffix "foo", we will add the bundle identifier to this, ending up with a suffix of "foo/com.apple.WebKit.Networking", which will make confstr fail. We can revive the patch which creates the directories, if you think that's a better option? Thanks for reviewing! 1732188 21 pvollan 2021-02-22 10:21:53 -0800 (In reply to Brent Fulgham from comment #18) > Comment on attachment 421121 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421121&action=review > > > Source/WebKit/ChangeLog:17 > > + which was the first attempt at fixing this crash, but was unsuccessful in doing so. > > If creating these custom directories is only ever used by our test > infrastructure, I wonder if we should require our test harness to create the > directories. WebContent process could set the user directory suffix and > attempt to use it, but would be unable to make file system changes. > > What if we simply crashed with a meaningful error message if we attempt to > set user directory suffix? I think there are other clients that end up using this feature, which then causes a crash when the sandbox does not compile due to the user directory suffix containing a path. I think one option is to revive the original patch that creates these directories if they do not exist. Thanks for reviewing! 1732194 22 ap 2021-02-22 10:37:38 -0800 > Can you explain what you mean by ignoring u-d-s if it contains '/'? Do you > mean we only want a suffix that cannot traverse directories (e.g., "dogfood" > is okay, but "dogfood/test" is not)? > > If so, I think that sounds like a good plan. Yes, that was my idea exactly. 1732230 23 421219 pvollan 2021-02-22 11:56:07 -0800 Created attachment 421219 Patch 1732232 24 pvollan 2021-02-22 11:57:44 -0800 (In reply to Alexey Proskuryakov from comment #22) > > Can you explain what you mean by ignoring u-d-s if it contains '/'? Do you > > mean we only want a suffix that cannot traverse directories (e.g., "dogfood" > > is okay, but "dogfood/test" is not)? > > > > If so, I think that sounds like a good plan. > > Yes, that was my idea exactly. Sounds good, I have updated the patch. Thanks for reviewing! 1732255 25 421219 bfulgham 2021-02-22 12:32:53 -0800 Comment on attachment 421219 Patch r=me 1732258 26 421219 pvollan 2021-02-22 12:34:06 -0800 Comment on attachment 421219 Patch Thanks for reviewing! 1732266 27 421219 ap 2021-02-22 13:00:36 -0800 Comment on attachment 421219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421219&action=review > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:644 > + auto firstPathSeparator = suffix.find("/"); This could use a comment explaining why. And I still think that there should be system logging about non-trivial behavior choices like this. 1732270 28 ews-feeder 2021-02-22 13:08:19 -0800 Committed r273271: <https://commits.webkit.org/r273271> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421219. 1732273 29 bfulgham 2021-02-22 13:11:39 -0800 (In reply to Alexey Proskuryakov from comment #27) > Comment on attachment 421219 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421219&action=review > > > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:644 > > + auto firstPathSeparator = suffix.find("/"); > > This could use a comment explaining why. > > And I still think that there should be system logging about non-trivial > behavior choices like this. Per Arne: Could you do a follow-up patch (under a different radar) to do these two things? 1732277 30 pvollan 2021-02-22 13:19:34 -0800 (In reply to Alexey Proskuryakov from comment #27) > Comment on attachment 421219 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421219&action=review > > > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:644 > > + auto firstPathSeparator = suffix.find("/"); > > This could use a comment explaining why. > > And I still think that there should be system logging about non-trivial > behavior choices like this. Yes, that makes sense, I will follow up on this. Thanks for reviewing! 1732278 31 pvollan 2021-02-22 13:20:07 -0800 (In reply to Brent Fulgham from comment #29) > (In reply to Alexey Proskuryakov from comment #27) > > Comment on attachment 421219 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=421219&action=review > > > > > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:644 > > > + auto firstPathSeparator = suffix.find("/"); > > > > This could use a comment explaining why. > > > > And I still think that there should be system logging about non-trivial > > behavior choices like this. > > Per Arne: Could you do a follow-up patch (under a different radar) to do > these two things? Will do, thanks for reviewing! 1732346 32 pvollan 2021-02-22 15:51:49 -0800 Reopening to attach new patch. 1732347 33 421252 pvollan 2021-02-22 15:51:51 -0800 Created attachment 421252 Patch 1732360 34 sam 2021-02-22 16:08:03 -0800 (In reply to Per Arne Vollan from comment #21) > (In reply to Brent Fulgham from comment #18) > > Comment on attachment 421121 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=421121&action=review > > > > > Source/WebKit/ChangeLog:17 > > > + which was the first attempt at fixing this crash, but was unsuccessful in doing so. > > > > If creating these custom directories is only ever used by our test > > infrastructure, I wonder if we should require our test harness to create the > > directories. WebContent process could set the user directory suffix and > > attempt to use it, but would be unable to make file system changes. > > > > What if we simply crashed with a meaningful error message if we attempt to > > set user directory suffix? > > I think there are other clients that end up using this feature, which then > causes a crash when the sandbox does not compile due to the user directory > suffix containing a path. > We expect users of SPI to know what they are doing, especially if we put the word "Testing" in the name. Using bundle ID checks should really only ever be a temporary measure when dealing with Apple internal things. 1732390 35 ap 2021-02-22 17:09:56 -0800 The new patch is marked cq+, but the bug is in RESOLVED state, so commit queue won't process it. I think that an ideal log would also say something when we decide to ignore because of a slash, and even says something if we decide to ignore because the client is sandboxed. Sam, what safeguards would remain if we had an SPI? I mostly like this idea, but we also need to make sure that an SPI cannot be used maliciously. 1732439 36 sam 2021-02-22 20:26:38 -0800 (In reply to Alexey Proskuryakov from comment #35) > The new patch is marked cq+, but the bug is in RESOLVED state, so commit > queue won't process it. > > I think that an ideal log would also say something when we decide to ignore > because of a slash, and even says something if we decide to ignore because > the client is sandboxed. > > > Sam, what safeguards would remain if we had an SPI? I mostly like this idea, > but we also need to make sure that an SPI cannot be used maliciously. What attack are you considering? 1732498 37 pvollan 2021-02-23 05:30:11 -0800 Reopening to attach new patch. 1732499 38 421304 pvollan 2021-02-23 05:30:13 -0800 Created attachment 421304 Patch 1732506 39 ews-feeder 2021-02-23 05:58:39 -0800 Committed r273304: <https://commits.webkit.org/r273304> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421304. 1732576 40 ap 2021-02-23 10:09:35 -0800 > What attack are you considering? If malicious code running in UI process has control over cache and temporary directories of WebKit XPC processes, it can affect what XPC processes do before they enter the sandbox (e.g. write something there to exploit bugs in deserialization code to gain arbitrary code execution). In general, we want to take as little input from UI process before entering sandbox as possible. > Reopening to attach new patch. I just noticed that the patch truncates the suffix instead of completely ignoring it when there is a slash. What is the reason for this behavior? It seems harder to reason about. Not a terribly huge deal because most WebKit clients should be sandboxed anyway, and then we completely ignore the suffix. 1732594 41 sam 2021-02-23 10:36:01 -0800 (In reply to Alexey Proskuryakov from comment #40) > > What attack are you considering? > > If malicious code running in UI process has control over cache and temporary > directories of WebKit XPC processes, it can affect what XPC processes do > before they enter the sandbox (e.g. write something there to exploit bugs in > deserialization code to gain arbitrary code execution). In general, we want > to take as little input from UI process before entering sandbox as possible. Gotcha. That old one (It is so frustrating that window exists at all, I need to follow up on if we can just stop doing that). The traditional way of handling this, and what I think we could do here, is to require an entitlement on the host to do this, and to give that entitlement to our testing apps. I would much prefer entitlement based policy over bundle ID policy as it is scalable. 1732601 42 commit-queue 2021-02-23 10:54:03 -0800 Re-opened since this is blocked by bug 222324 421102 2021-02-20 12:37:09 -0800 2021-02-20 16:45:28 -0800 Patch bug-222233-20210220123708.patch text/plain 4778 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyMDMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IG1ha2luZyBz dXJlIHRoZSBjb25mc3RyIHRlbXAgYW5kIGNhY2hlIGRpcmVjdG9yaWVzCisgICAgICAgIGV4aXN0 IGJlZm9yZSBjYWxsaW5nIGNvbmZzdHIuIEFkZGl0aW9uYWxseSwgdGhpcyBwYXRjaCByZXZlcnRz IHIyNzE0MTcsIHdoaWNoIHdhcyB0aGUgZmlyc3QgYXR0ZW1wdCBhdCBmaXhpbmcgdGhpcworICAg ICAgICBjcmFzaCwgYnV0IHdhcyB1bnN1Y2Nlc3NmdWwgaW4gZG9pbmcgc28uCisKKyAgICAgICAg KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6Omlu aXRpYWxpemVTYW5kYm94UGFyYW1ldGVycyk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVBy b2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KToKKwogMjAyMS0wMi0yMCAgV2Vuc29uIEhzaWVoICA8 d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcg cjI3MzExNS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNz TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQ cm9jZXNzTWFjLm1tCShyZXZpc2lvbiAyNzMxOTgpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9t YWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjM5LDkgKzYzOSwx NyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgLy8gVmVy aWZ5IHVzZXIgZGlyZWN0b3J5IHN1ZmZpeC4KICAgICBpZiAoc2FuZGJveFBhcmFtZXRlcnMudXNl ckRpcmVjdG9yeVN1ZmZpeCgpLmlzTnVsbCgpKSB7CiAgICAgICAgIGF1dG8gdXNlckRpcmVjdG9y eVN1ZmZpeCA9IHBhcmFtZXRlcnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZmluZCgidXNlci1k aXJlY3Rvcnktc3VmZml4Iik7Ci0gICAgICAgIGlmICh1c2VyRGlyZWN0b3J5U3VmZml4ICE9IHBh cmFtZXRlcnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZW5kKCkpCi0gICAgICAgICAgICBzYW5k Ym94UGFyYW1ldGVycy5zZXRVc2VyRGlyZWN0b3J5U3VmZml4KFttYWtlU3RyaW5nKHVzZXJEaXJl Y3RvcnlTdWZmaXgtPnZhbHVlLCAnLycsIFN0cmluZyhbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1 bmRsZUlkZW50aWZpZXJdKSkgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXSk7Ci0gICAgICAgIGVs c2UgeworICAgICAgICBpZiAodXNlckRpcmVjdG9yeVN1ZmZpeCAhPSBwYXJhbWV0ZXJzLmV4dHJh SW5pdGlhbGl6YXRpb25EYXRhLmVuZCgpKSB7CisgICAgICAgICAgICBhdXRvIHN1ZmZpeCA9IFtt YWtlU3RyaW5nKHVzZXJEaXJlY3RvcnlTdWZmaXgtPnZhbHVlLCAnLycsIFN0cmluZyhbW05TQnVu ZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdKSkgZmlsZVN5c3RlbVJlcHJlc2VudGF0 aW9uXTsKKyAgICAgICAgICAgIHNhbmRib3hQYXJhbWV0ZXJzLnNldFVzZXJEaXJlY3RvcnlTdWZm aXgoc3VmZml4KTsKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiV2ViS2l0IGNsaWVudCBzZXQg dXNlciBkaXJlY3Rvcnkgc3VmZml4OiAlcyIsIHVzZXJEaXJlY3RvcnlTdWZmaXgtPnZhbHVlLnV0 ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSB0ZW1wIGFuZCBjYWNo ZSBkaXJlY3RvcmllcyB3aXRoIHVzZXIgc3VmZml4IGV4aXN0cywgc2luY2UgY29uZnN0ciBkZXBl bmRzIG9uIHRoYXQuCisgICAgICAgICAgICBjaGFyIHBhdGhbUEFUSF9NQVhdID0geyAwIH07Cisg ICAgICAgICAgICBpZiAoY29uZnN0cihfQ1NfREFSV0lOX1VTRVJfQ0FDSEVfRElSLCBwYXRoLCBz aXplb2YocGF0aCkpKQorICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3Rv cmllcyhTdHJpbmcocGF0aCkgKyAiLyIgKyBzdWZmaXgpOworICAgICAgICAgICAgaWYgKGNvbmZz dHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCBwYXRoLCBzaXplb2YocGF0aCkpKQorICAgICAg ICAgICAgICAgIEZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3RvcmllcyhTdHJpbmcocGF0aCkgKyAi LyIgKyBzdWZmaXgpOworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgU3RyaW5nIGNsaWVu dElkZW50aWZpZXIgPSBjb2RlU2lnbmluZ0lkZW50aWZpZXIocGFyYW1ldGVycy5jb25uZWN0aW9u SWRlbnRpZmllci54cGNDb25uZWN0aW9uLmdldCgpKTsKICAgICAgICAgICAgIGlmIChjbGllbnRJ ZGVudGlmaWVyLmlzTnVsbCgpKQogICAgICAgICAgICAgICAgIGNsaWVudElkZW50aWZpZXIgPSBw YXJhbWV0ZXJzLmNsaWVudElkZW50aWZpZXI7CkBAIC02NjAsNyArNjY4LDcgQEAgc3RhdGljIHZv aWQgaW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKAogICAgIHNhbmRib3hQYXJhbWV0ZXJzLmFk ZFBhcmFtZXRlcigiX09TX1ZFUlNJT04iLCBvc1ZlcnNpb24udXRmOCgpLmRhdGEoKSk7CiAKICAg ICAvLyBVc2UgcHJpdmF0ZSB0ZW1wb3JhcnkgYW5kIGNhY2hlIGRpcmVjdG9yaWVzLgotICAgIF9z ZXRfdXNlcl9kaXJfc3VmZml4KEZpbGVTeXN0ZW06OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihz YW5kYm94UGFyYW1ldGVycy51c2VyRGlyZWN0b3J5U3VmZml4KCkpLmRhdGEoKSk7CisgICAgc2V0 ZW52KCJESVJIRUxQRVJfVVNFUl9ESVJfU1VGRklYIiwgRmlsZVN5c3RlbTo6ZmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3RvcnlTdWZmaXgoKSkuZGF0 YSgpLCAxKTsKICAgICBjaGFyIHRlbXBvcmFyeURpcmVjdG9yeVtQQVRIX01BWF07CiAgICAgaWYg KCFjb25mc3RyKF9DU19EQVJXSU5fVVNFUl9URU1QX0RJUiwgdGVtcG9yYXJ5RGlyZWN0b3J5LCBz aXplb2YodGVtcG9yYXJ5RGlyZWN0b3J5KSkpIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCIlczog Y291bGRuJ3QgcmV0cmlldmUgcHJpdmF0ZSB0ZW1wb3JhcnkgZGlyZWN0b3J5IHBhdGg6ICVkXG4i LCBnZXRwcm9nbmFtZSgpLCBlcnJubyk7CkBAIC03MDYsMTAgKzcxNCw2IEBAIHZvaWQgQXV4aWxp YXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gKICNpZiBVU0UoQ0FDSEVfQ09NUElMRURfU0FO REJPWCkKICAgICAvLyBUaGlzIG11c3QgYmUgY2FsbGVkIGJlZm9yZSBpbml0aWFsaXplU2FuZGJv eFBhcmFtZXRlcnMgc28gdGhhdCB0aGUgcGF0aCBkb2VzIG5vdCBpbmNsdWRlIHRoZSB1c2VyIGRp cmVjdG9yeSBzdWZmaXguCiAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0aGUgdXNlciBkaXJlY3Rvcnkg c3VmZml4IGJlY2F1c2Ugd2Ugd2FudCBhbGwgcHJvY2Vzc2VzIG9mIHRoZSBzYW1lIHR5cGUgdG8g dXNlIHRoZSBzYW1lIGNhY2hlIGRpcmVjdG9yeS4KLSAgICAvLyBGaXJzdCwgbWFrZSBzdXJlIHRo ZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXggaXMgZW1wdHkgYXQgdGhpcyBwb2ludC4gVGhpcyBpcyBu b3JtYWxseSBhbHJlYWR5IHRoZSBjYXNlLCBidXQgc29tZSBob3N0Ci0gICAgLy8gcHJvY2Vzc2Vz IGFyZSBzZXR0aW5nIHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXgsIHdoaWNoIHdlIHdpbGwgaW5o ZXJpdCwgYW5kIG91ciBzYW5kYm94IGRhdGF2YXVsdCB3aWxsIHRoZW4gZW5kIHVwCi0gICAgLy8g aW5zaWRlIHRoZSBob3N0IHByb2Nlc3MnIGNhY2hlIGZvbGRlciwgd2hpY2ggaXMgdW5kZXNpcmFi bGUuCi0gICAgX3NldF91c2VyX2Rpcl9zdWZmaXgobnVsbHB0cik7CiAgICAgU3RyaW5nIGRhdGFW YXVsdFBhcmVudERpcmVjdG9yeSB7IHNhbmRib3hEYXRhVmF1bHRQYXJlbnREaXJlY3RvcnkoKSB9 OwogI2Vsc2UKICAgICBTdHJpbmcgZGF0YVZhdWx0UGFyZW50RGlyZWN0b3J5Owo= 421112 2021-02-20 14:23:41 -0800 2021-02-20 16:45:12 -0800 Patch bug-222233-20210220142340.patch text/plain 4857 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyMDMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAg ICAgICAgV2hlbiBhIFdlYktpdCBjbGllbnQgcHJvdmlkZXMgYSB1c2VyIGRpcmVjdG9yeSBzdWZm aXggaW4gdGhlIHByb2Nlc3MgaW5pdGlhbGl6YXRpb24gcGFyYW1ldGVycywgY29uZnN0ciB3aXRo IHRoZSBuZXcKKyAgICAgICAgdXNlciBzdWZmaXggYXBwbGllZCB3aWxsIGZhaWwgdG8gY3JlYXRl IHRoZSBmdWxsIGRpcmVjdG9yeSBwYXRoIGlmIGl0IGRvZXMgbm90IGV4aXN0LCBhbmQgcmV0dXJu IGFuIGVtcHR5IHJlc3VsdC4KKyAgICAgICAgVGhpcyB3aWxsIGxlYWQgdG8gZW1wdHkgcGF0aHMg aW4gdGhlIHNhbmRib3ggcGFyYW1ldGVycywgd2hpY2ggd2lsbCBjYXVzZSB0aGUgc2FuZGJveCB0 byBmYWlsIHRvIGNvbXBpbGUsIHdoaWNoIHdpbGwKKyAgICAgICAgZXZlbnR1YWxseSBjcmFzaCB0 aGUgV2ViS2l0IHByb2Nlc3MuIFRoaXMgcGF0Y2ggYWRkcmVzc2VzIHRoaXMgYnkgbWFraW5nIHN1 cmUgdGhlIGNvbmZzdHIgdGVtcCBhbmQgY2FjaGUgZGlyZWN0b3JpZXMKKyAgICAgICAgZXhpc3Qg YmVmb3JlIGNhbGxpbmcgY29uZnN0ci4gQWRkaXRpb25hbGx5LCB0aGlzIHBhdGNoIHJldmVydHMg cjI3MTQxNywgd2hpY2ggd2FzIHRoZSBmaXJzdCBhdHRlbXB0IGF0IGZpeGluZyB0aGlzCisgICAg ICAgIGNyYXNoLCBidXQgd2FzIHVuc3VjY2Vzc2Z1bCBpbiBkb2luZyBzby4KKworICAgICAgICAq IFNoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6aW5p dGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJv Y2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gpOgorCiAyMDIxLTAyLTIwICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyBy MjczMTE1LgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NN YWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVBy b2Nlc3NNYWMubW0JKHJldmlzaW9uIDI3MzE5OCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21h Yy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MzksOSArNjM5LDE4 IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTYW5kYm94UGFyYW1ldGVycygKICAgICAvLyBWZXJp ZnkgdXNlciBkaXJlY3Rvcnkgc3VmZml4LgogICAgIGlmIChzYW5kYm94UGFyYW1ldGVycy51c2Vy RGlyZWN0b3J5U3VmZml4KCkuaXNOdWxsKCkpIHsKICAgICAgICAgYXV0byB1c2VyRGlyZWN0b3J5 U3VmZml4ID0gcGFyYW1ldGVycy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5maW5kKCJ1c2VyLWRp cmVjdG9yeS1zdWZmaXgiKTsKLSAgICAgICAgaWYgKHVzZXJEaXJlY3RvcnlTdWZmaXggIT0gcGFy YW1ldGVycy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5lbmQoKSkKLSAgICAgICAgICAgIHNhbmRi b3hQYXJhbWV0ZXJzLnNldFVzZXJEaXJlY3RvcnlTdWZmaXgoW21ha2VTdHJpbmcodXNlckRpcmVj dG9yeVN1ZmZpeC0+dmFsdWUsICcvJywgU3RyaW5nKFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVu ZGxlSWRlbnRpZmllcl0pKSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dKTsKLSAgICAgICAgZWxz ZSB7CisgICAgICAgIGlmICh1c2VyRGlyZWN0b3J5U3VmZml4ICE9IHBhcmFtZXRlcnMuZXh0cmFJ bml0aWFsaXphdGlvbkRhdGEuZW5kKCkpIHsKKyAgICAgICAgICAgIGF1dG8gc3VmZml4ID0gW21h a2VTdHJpbmcodXNlckRpcmVjdG9yeVN1ZmZpeC0+dmFsdWUsICcvJywgU3RyaW5nKFtbTlNCdW5k bGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0pKSBmaWxlU3lzdGVtUmVwcmVzZW50YXRp b25dOworICAgICAgICAgICAgc2FuZGJveFBhcmFtZXRlcnMuc2V0VXNlckRpcmVjdG9yeVN1ZmZp eChzdWZmaXgpOworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJXZWJLaXQgY2xpZW50IHNldCB1 c2VyIGRpcmVjdG9yeSBzdWZmaXg6ICVzIiwgdXNlckRpcmVjdG9yeVN1ZmZpeC0+dmFsdWUudXRm OCgpLmRhdGEoKSk7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCh1c2VyRGlyZWN0b3J5U3Vm Zml4LT52YWx1ZS5maW5kKCIuLiIpID09IG5vdEZvdW5kKTsKKyAgICAgICAgICAgIC8vIE1ha2Ug c3VyZSB0aGUgdGVtcCBhbmQgY2FjaGUgZGlyZWN0b3JpZXMgd2l0aCB1c2VyIHN1ZmZpeCBleGlz dHMsIHNpbmNlIGNvbmZzdHIgZGVwZW5kcyBvbiB0aGF0LgorICAgICAgICAgICAgY2hhciBwYXRo W1BBVEhfTUFYXSA9IHsgMCB9OworICAgICAgICAgICAgaWYgKGNvbmZzdHIoX0NTX0RBUldJTl9V U0VSX0NBQ0hFX0RJUiwgcGF0aCwgc2l6ZW9mKHBhdGgpKSkKKyAgICAgICAgICAgICAgICBGaWxl U3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMoU3RyaW5nKHBhdGgpICsgIi8iICsgc3VmZml4KTsK KyAgICAgICAgICAgIGlmIChjb25mc3RyKF9DU19EQVJXSU5fVVNFUl9URU1QX0RJUiwgcGF0aCwg c2l6ZW9mKHBhdGgpKSkKKyAgICAgICAgICAgICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0 b3JpZXMoU3RyaW5nKHBhdGgpICsgIi8iICsgc3VmZml4KTsKKyAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIFN0cmluZyBjbGllbnRJZGVudGlmaWVyID0gY29kZVNpZ25pbmdJZGVudGlmaWVy KHBhcmFtZXRlcnMuY29ubmVjdGlvbklkZW50aWZpZXIueHBjQ29ubmVjdGlvbi5nZXQoKSk7CiAg ICAgICAgICAgICBpZiAoY2xpZW50SWRlbnRpZmllci5pc051bGwoKSkKICAgICAgICAgICAgICAg ICBjbGllbnRJZGVudGlmaWVyID0gcGFyYW1ldGVycy5jbGllbnRJZGVudGlmaWVyOwpAQCAtNjYw LDcgKzY2OSw3IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTYW5kYm94UGFyYW1ldGVycygKICAg ICBzYW5kYm94UGFyYW1ldGVycy5hZGRQYXJhbWV0ZXIoIl9PU19WRVJTSU9OIiwgb3NWZXJzaW9u LnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgLy8gVXNlIHByaXZhdGUgdGVtcG9yYXJ5IGFuZCBjYWNo ZSBkaXJlY3Rvcmllcy4KLSAgICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChGaWxlU3lzdGVtOjpmaWxl U3lzdGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9yeVN1ZmZp eCgpKS5kYXRhKCkpOworICAgIHNldGVudigiRElSSEVMUEVSX1VTRVJfRElSX1NVRkZJWCIsIEZp bGVTeXN0ZW06OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihzYW5kYm94UGFyYW1ldGVycy51c2Vy RGlyZWN0b3J5U3VmZml4KCkpLmRhdGEoKSwgMSk7CiAgICAgY2hhciB0ZW1wb3JhcnlEaXJlY3Rv cnlbUEFUSF9NQVhdOwogICAgIGlmICghY29uZnN0cihfQ1NfREFSV0lOX1VTRVJfVEVNUF9ESVIs IHRlbXBvcmFyeURpcmVjdG9yeSwgc2l6ZW9mKHRlbXBvcmFyeURpcmVjdG9yeSkpKSB7CiAgICAg ICAgIFdURkxvZ0Fsd2F5cygiJXM6IGNvdWxkbid0IHJldHJpZXZlIHByaXZhdGUgdGVtcG9yYXJ5 IGRpcmVjdG9yeSBwYXRoOiAlZFxuIiwgZ2V0cHJvZ25hbWUoKSwgZXJybm8pOwpAQCAtNzA2LDEw ICs3MTUsNiBAQCB2b2lkIEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CiAjaWYg VVNFKENBQ0hFX0NPTVBJTEVEX1NBTkRCT1gpCiAgICAgLy8gVGhpcyBtdXN0IGJlIGNhbGxlZCBi ZWZvcmUgaW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzIHNvIHRoYXQgdGhlIHBhdGggZG9lcyBu b3QgaW5jbHVkZSB0aGUgdXNlciBkaXJlY3Rvcnkgc3VmZml4LgogICAgIC8vIFdlIGRvbid0IHdh bnQgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCBiZWNhdXNlIHdlIHdhbnQgYWxsIHByb2Nlc3Nl cyBvZiB0aGUgc2FtZSB0eXBlIHRvIHVzZSB0aGUgc2FtZSBjYWNoZSBkaXJlY3RvcnkuCi0gICAg Ly8gRmlyc3QsIG1ha2Ugc3VyZSB0aGUgdXNlciBkaXJlY3Rvcnkgc3VmZml4IGlzIGVtcHR5IGF0 IHRoaXMgcG9pbnQuIFRoaXMgaXMgbm9ybWFsbHkgYWxyZWFkeSB0aGUgY2FzZSwgYnV0IHNvbWUg aG9zdAotICAgIC8vIHByb2Nlc3NlcyBhcmUgc2V0dGluZyB0aGUgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4LCB3aGljaCB3ZSB3aWxsIGluaGVyaXQsIGFuZCBvdXIgc2FuZGJveCBkYXRhdmF1bHQgd2ls bCB0aGVuIGVuZCB1cAotICAgIC8vIGluc2lkZSB0aGUgaG9zdCBwcm9jZXNzJyBjYWNoZSBmb2xk ZXIsIHdoaWNoIGlzIHVuZGVzaXJhYmxlLgotICAgIF9zZXRfdXNlcl9kaXJfc3VmZml4KG51bGxw dHIpOwogICAgIFN0cmluZyBkYXRhVmF1bHRQYXJlbnREaXJlY3RvcnkgeyBzYW5kYm94RGF0YVZh dWx0UGFyZW50RGlyZWN0b3J5KCkgfTsKICNlbHNlCiAgICAgU3RyaW5nIGRhdGFWYXVsdFBhcmVu dERpcmVjdG9yeTsK 421118 2021-02-20 15:40:35 -0800 2021-02-20 16:42:46 -0800 Patch bug-222233-20210220154035.patch text/plain 6924 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyMDkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IHJlbW92aW5n IHRoZSBjbGllbnQncyBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGNvbmZzdHIKKyAgICAgICAgY2Fj aGUgYW5kIHRlbXAgZm9sZGVyIGZvciB0aGUgV2ViS2l0IHByb2Nlc3MuIEFsbCBXZWJLaXQgcHJv Y2Vzc2VzIHdpbGwgbm93IGdldCB0aGUgZGVmYXVsdCB1c2VyIGRpcmVjdG9yeSBzdWZmaXgsIGUu Zy4KKyAgICAgICAgJ2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZytjb20uYXBwbGUubWVkaWFy ZW1vdGVkJy4gQWRkaXRpb25hbGx5LCB0aGlzIHBhdGNoIHJldmVydHMgcjI3MTQxNywgd2hpY2gg d2FzIHRoZSBmaXJzdAorICAgICAgICBhdHRlbXB0IGF0IGZpeGluZyB0aGlzIGNyYXNoLCBidXQg d2FzIHVuc3VjY2Vzc2Z1bCBpbiBkb2luZyBzby4KKworICAgICAgICAqIFNoYXJlZC9FbnRyeVBv aW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW06Cisg ICAgICAgIChXZWJLaXQ6OlhQQ1NlcnZpY2VJbml0aWFsaXplckRlbGVnYXRlOjpnZXRFeHRyYUlu aXRpYWxpemF0aW9uRGF0YSk6CisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNz TWFjLm1tOgorICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMpOgor ICAgICAgICAoV2ViS2l0OjpBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6Cisg ICAgICAgICogVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyk6CisKIDIwMjEt MDItMjAgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBQQ006 IFN0b3JlIGFuZCByZXBvcnQgc291cmNlIHVubGlua2FibGUgdG9rZW5zCkluZGV4OiBTb3VyY2Uv V2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2Vy dmljZUVudHJ5UG9pbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvRW50 cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1t CShyZXZpc2lvbiAyNzMxOTgpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRp bGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEyMSwxMiArMTIxLDYgQEAgYm9vbCBYUENTZXJ2aWNlSW5pdGlhbGl6ZXJEZWxl Z2F0ZTo6Z2V0RQogICAgIGlmICghaXNQcmV3YXJtZWRQcm9jZXNzLmlzRW1wdHkoKSkKICAgICAg ICAgZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuYWRkKCJpcy1wcmV3YXJtZWQiX3MsIGlzUHJld2Fy bWVkUHJvY2Vzcyk7CiAKLSAgICBpZiAoIWlzQ2xpZW50U2FuZGJveGVkKCkpIHsKLSAgICAgICAg U3RyaW5nIHVzZXJEaXJlY3RvcnlTdWZmaXggPSB4cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKGV4 dHJhRGF0YUluaXRpYWxpemF0aW9uRGF0YU9iamVjdCwgInVzZXItZGlyZWN0b3J5LXN1ZmZpeCIp OwotICAgICAgICBpZiAoIXVzZXJEaXJlY3RvcnlTdWZmaXguaXNFbXB0eSgpKQotICAgICAgICAg ICAgZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuYWRkKCJ1c2VyLWRpcmVjdG9yeS1zdWZmaXgiX3Ms IHVzZXJEaXJlY3RvcnlTdWZmaXgpOwotICAgIH0KLQogICAgIFN0cmluZyBhbHdheXNSdW5zQXRC YWNrZ3JvdW5kUHJpb3JpdHkgPSB4cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKGV4dHJhRGF0YUlu aXRpYWxpemF0aW9uRGF0YU9iamVjdCwgImFsd2F5cy1ydW5zLWF0LWJhY2tncm91bmQtcHJpb3Jp dHkiKTsKICAgICBpZiAoIWFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eS5pc0VtcHR5KCkp CiAgICAgICAgIGV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmFkZCgiYWx3YXlzLXJ1bnMtYXQtYmFj a2dyb3VuZC1wcmlvcml0eSJfcywgYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1t CShyZXZpc2lvbiAyNzMxOTgpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5 UHJvY2Vzc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjM4LDE2ICs2MzgsMTEgQEAgc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKAogewogICAgIC8vIFZlcmlmeSB1c2Vy IGRpcmVjdG9yeSBzdWZmaXguCiAgICAgaWYgKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3Rv cnlTdWZmaXgoKS5pc051bGwoKSkgewotICAgICAgICBhdXRvIHVzZXJEaXJlY3RvcnlTdWZmaXgg PSBwYXJhbWV0ZXJzLmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmZpbmQoInVzZXItZGlyZWN0b3J5 LXN1ZmZpeCIpOwotICAgICAgICBpZiAodXNlckRpcmVjdG9yeVN1ZmZpeCAhPSBwYXJhbWV0ZXJz LmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmVuZCgpKQotICAgICAgICAgICAgc2FuZGJveFBhcmFt ZXRlcnMuc2V0VXNlckRpcmVjdG9yeVN1ZmZpeChbbWFrZVN0cmluZyh1c2VyRGlyZWN0b3J5U3Vm Zml4LT52YWx1ZSwgJy8nLCBTdHJpbmcoW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVu dGlmaWVyXSkpIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl0pOwotICAgICAgICBlbHNlIHsKLSAg ICAgICAgICAgIFN0cmluZyBjbGllbnRJZGVudGlmaWVyID0gY29kZVNpZ25pbmdJZGVudGlmaWVy KHBhcmFtZXRlcnMuY29ubmVjdGlvbklkZW50aWZpZXIueHBjQ29ubmVjdGlvbi5nZXQoKSk7Ci0g ICAgICAgICAgICBpZiAoY2xpZW50SWRlbnRpZmllci5pc051bGwoKSkKLSAgICAgICAgICAgICAg ICBjbGllbnRJZGVudGlmaWVyID0gcGFyYW1ldGVycy5jbGllbnRJZGVudGlmaWVyOwotICAgICAg ICAgICAgU3RyaW5nIGRlZmF1bHRVc2VyRGlyZWN0b3J5U3VmZml4ID0gbWFrZVN0cmluZyhTdHJp bmcoW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSksICcrJywgY2xpZW50 SWRlbnRpZmllcik7Ci0gICAgICAgICAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRVc2VyRGlyZWN0 b3J5U3VmZml4KGRlZmF1bHRVc2VyRGlyZWN0b3J5U3VmZml4KTsKLSAgICAgICAgfQorICAgICAg ICBTdHJpbmcgY2xpZW50SWRlbnRpZmllciA9IGNvZGVTaWduaW5nSWRlbnRpZmllcihwYXJhbWV0 ZXJzLmNvbm5lY3Rpb25JZGVudGlmaWVyLnhwY0Nvbm5lY3Rpb24uZ2V0KCkpOworICAgICAgICBp ZiAoY2xpZW50SWRlbnRpZmllci5pc051bGwoKSkKKyAgICAgICAgICAgIGNsaWVudElkZW50aWZp ZXIgPSBwYXJhbWV0ZXJzLmNsaWVudElkZW50aWZpZXI7CisgICAgICAgIFN0cmluZyBkZWZhdWx0 VXNlckRpcmVjdG9yeVN1ZmZpeCA9IG1ha2VTdHJpbmcoU3RyaW5nKFtbTlNCdW5kbGUgbWFpbkJ1 bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0pLCAnKycsIGNsaWVudElkZW50aWZpZXIpOworICAgICAg ICBzYW5kYm94UGFyYW1ldGVycy5zZXRVc2VyRGlyZWN0b3J5U3VmZml4KGRlZmF1bHRVc2VyRGly ZWN0b3J5U3VmZml4KTsKICAgICB9CiAKICAgICBTdHJpbmcgb3NTeXN0ZW1NYXJrZXRpbmdWZXJz aW9uID0gc3lzdGVtTWFya2V0aW5nVmVyc2lvbigpOwpAQCAtNjYwLDcgKzY1NSw3IEBAIHN0YXRp YyB2b2lkIGluaXRpYWxpemVTYW5kYm94UGFyYW1ldGVycygKICAgICBzYW5kYm94UGFyYW1ldGVy cy5hZGRQYXJhbWV0ZXIoIl9PU19WRVJTSU9OIiwgb3NWZXJzaW9uLnV0ZjgoKS5kYXRhKCkpOwog CiAgICAgLy8gVXNlIHByaXZhdGUgdGVtcG9yYXJ5IGFuZCBjYWNoZSBkaXJlY3Rvcmllcy4KLSAg ICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChGaWxlU3lzdGVtOjpmaWxlU3lzdGVtUmVwcmVzZW50YXRp b24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9yeVN1ZmZpeCgpKS5kYXRhKCkpOworICAg IHNldGVudigiRElSSEVMUEVSX1VTRVJfRElSX1NVRkZJWCIsIEZpbGVTeXN0ZW06OmZpbGVTeXN0 ZW1SZXByZXNlbnRhdGlvbihzYW5kYm94UGFyYW1ldGVycy51c2VyRGlyZWN0b3J5U3VmZml4KCkp LmRhdGEoKSwgMSk7CiAgICAgY2hhciB0ZW1wb3JhcnlEaXJlY3RvcnlbUEFUSF9NQVhdOwogICAg IGlmICghY29uZnN0cihfQ1NfREFSV0lOX1VTRVJfVEVNUF9ESVIsIHRlbXBvcmFyeURpcmVjdG9y eSwgc2l6ZW9mKHRlbXBvcmFyeURpcmVjdG9yeSkpKSB7CiAgICAgICAgIFdURkxvZ0Fsd2F5cygi JXM6IGNvdWxkbid0IHJldHJpZXZlIHByaXZhdGUgdGVtcG9yYXJ5IGRpcmVjdG9yeSBwYXRoOiAl ZFxuIiwgZ2V0cHJvZ25hbWUoKSwgZXJybm8pOwpAQCAtNzA2LDEwICs3MDEsNiBAQCB2b2lkIEF1 eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CiAjaWYgVVNFKENBQ0hFX0NPTVBJTEVE X1NBTkRCT1gpCiAgICAgLy8gVGhpcyBtdXN0IGJlIGNhbGxlZCBiZWZvcmUgaW5pdGlhbGl6ZVNh bmRib3hQYXJhbWV0ZXJzIHNvIHRoYXQgdGhlIHBhdGggZG9lcyBub3QgaW5jbHVkZSB0aGUgdXNl ciBkaXJlY3Rvcnkgc3VmZml4LgogICAgIC8vIFdlIGRvbid0IHdhbnQgdGhlIHVzZXIgZGlyZWN0 b3J5IHN1ZmZpeCBiZWNhdXNlIHdlIHdhbnQgYWxsIHByb2Nlc3NlcyBvZiB0aGUgc2FtZSB0eXBl IHRvIHVzZSB0aGUgc2FtZSBjYWNoZSBkaXJlY3RvcnkuCi0gICAgLy8gRmlyc3QsIG1ha2Ugc3Vy ZSB0aGUgdXNlciBkaXJlY3Rvcnkgc3VmZml4IGlzIGVtcHR5IGF0IHRoaXMgcG9pbnQuIFRoaXMg aXMgbm9ybWFsbHkgYWxyZWFkeSB0aGUgY2FzZSwgYnV0IHNvbWUgaG9zdAotICAgIC8vIHByb2Nl c3NlcyBhcmUgc2V0dGluZyB0aGUgdXNlciBkaXJlY3Rvcnkgc3VmZml4LCB3aGljaCB3ZSB3aWxs IGluaGVyaXQsIGFuZCBvdXIgc2FuZGJveCBkYXRhdmF1bHQgd2lsbCB0aGVuIGVuZCB1cAotICAg IC8vIGluc2lkZSB0aGUgaG9zdCBwcm9jZXNzJyBjYWNoZSBmb2xkZXIsIHdoaWNoIGlzIHVuZGVz aXJhYmxlLgotICAgIF9zZXRfdXNlcl9kaXJfc3VmZml4KG51bGxwdHIpOwogICAgIFN0cmluZyBk YXRhVmF1bHRQYXJlbnREaXJlY3RvcnkgeyBzYW5kYm94RGF0YVZhdWx0UGFyZW50RGlyZWN0b3J5 KCkgfTsKICNlbHNlCiAgICAgU3RyaW5nIGRhdGFWYXVsdFBhcmVudERpcmVjdG9yeTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNw cAkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5 UHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksOSArNTksNiBAQCB2b2lkIEF1 eGlsaWFyeVByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0CiB7CiAgICAgbGF1bmNoT3B0aW9ucy5w cm9jZXNzSWRlbnRpZmllciA9IG1fcHJvY2Vzc0lkZW50aWZpZXI7CiAKLSAgICBpZiAoY29uc3Qg Y2hhciogdXNlckRpcmVjdG9yeVN1ZmZpeCA9IGdldGVudigiRElSSEVMUEVSX1VTRVJfRElSX1NV RkZJWCIpKQotICAgICAgICBsYXVuY2hPcHRpb25zLmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmFk ZCgidXNlci1kaXJlY3Rvcnktc3VmZml4Il9zLCB1c2VyRGlyZWN0b3J5U3VmZml4KTsKLQogICAg IGlmIChtX2Fsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSkKICAgICAgICAgbGF1bmNoT3B0 aW9ucy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5hZGQoImFsd2F5cy1ydW5zLWF0LWJhY2tncm91 bmQtcHJpb3JpdHkiX3MsICJ0cnVlIik7CiAK 421120 2021-02-20 16:40:35 -0800 2021-02-20 16:46:15 -0800 Patch bug-222233-20210220164035.patch text/plain 5028 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyMDkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IHJlbW92aW5n IHRoZSBjbGllbnQncyBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGNvbmZzdHIKKyAgICAgICAgY2Fj aGUgYW5kIHRlbXAgZm9sZGVyIGZvciBXZWJLaXQgcHJvY2Vzc2VzLCB1bmxlc3MgdGhlIGNsaWVu dCBpcyBhIFdlYktpdCB0ZXN0IGV4ZWN1dGFibGUuIFRoZSBwdXJwb3NlIG9mIHRoZSBmZWF0dXJl CisgICAgICAgIHRvIGxldCBjbGllbnRzIGNvbnRyb2wgdGhlIGNvbmZzdHIgcGF0aHMgb2YgV2Vi S2l0IHByb2Nlc3NlcyB3YXMgb25seSByZWxhdGVkIHRvIFdlYktpdCB0ZXN0aW5nIGJpbmFyaWVz LCBhbmQgc2hvdWxkCisgICAgICAgIGJlIGxpbWl0ZWQgdG8gdGhhdCBjYXNlLiBBbGwgV2ViS2l0 IHByb2Nlc3NlcyBmb3IgY2xpZW50cyBvdGhlciB0aGFuIFdlYktpdCB0ZXN0IGNsaWVudHMgd2ls bCBub3cgZ2V0IHRoZSBkZWZhdWx0IHVzZXIKKyAgICAgICAgZGlyZWN0b3J5IHN1ZmZpeCwgZS5n LiAnY29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5nK2NvbS5hcHBsZS5tZWRpYXJlbW90ZWQnLiBB ZGRpdGlvbmFsbHksIHRoaXMgcGF0Y2ggcmV2ZXJ0cyByMjcxNDE3LAorICAgICAgICB3aGljaCB3 YXMgdGhlIGZpcnN0IGF0dGVtcHQgYXQgZml4aW5nIHRoaXMgY3Jhc2gsIGJ1dCB3YXMgdW5zdWNj ZXNzZnVsIGluIGRvaW5nIHNvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tOgorICAgICAg ICAoV2ViS2l0Ojppbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMpOgorICAgICAgICAoV2ViS2l0 OjpBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6CisgICAgICAgICogVUlQcm9j ZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmlzV2ViS2l0 VGVzdEJpbmFyeSk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3NQcm94eTo6Z2V0 TGF1bmNoT3B0aW9ucyk6CisKIDIwMjEtMDItMjAgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBQQ006IFN0b3JlIGFuZCByZXBvcnQgc291cmNlIHVubGlua2Fi bGUgdG9rZW5zCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vz c01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5 UHJvY2Vzc01hYy5tbQkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQv bWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY2MCw3ICs2NjAs NyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgc2FuZGJv eFBhcmFtZXRlcnMuYWRkUGFyYW1ldGVyKCJfT1NfVkVSU0lPTiIsIG9zVmVyc2lvbi51dGY4KCku ZGF0YSgpKTsKIAogICAgIC8vIFVzZSBwcml2YXRlIHRlbXBvcmFyeSBhbmQgY2FjaGUgZGlyZWN0 b3JpZXMuCi0gICAgX3NldF91c2VyX2Rpcl9zdWZmaXgoRmlsZVN5c3RlbTo6ZmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3RvcnlTdWZmaXgoKSkuZGF0 YSgpKTsKKyAgICBzZXRlbnYoIkRJUkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiLCBGaWxlU3lzdGVt OjpmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9y eVN1ZmZpeCgpKS5kYXRhKCksIDEpOwogICAgIGNoYXIgdGVtcG9yYXJ5RGlyZWN0b3J5W1BBVEhf TUFYXTsKICAgICBpZiAoIWNvbmZzdHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCB0ZW1wb3Jh cnlEaXJlY3RvcnksIHNpemVvZih0ZW1wb3JhcnlEaXJlY3RvcnkpKSkgewogICAgICAgICBXVEZM b2dBbHdheXMoIiVzOiBjb3VsZG4ndCByZXRyaWV2ZSBwcml2YXRlIHRlbXBvcmFyeSBkaXJlY3Rv cnkgcGF0aDogJWRcbiIsIGdldHByb2duYW1lKCksIGVycm5vKTsKQEAgLTcwNiwxMCArNzA2LDYg QEAgdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveAogI2lmIFVTRShDQUNI RV9DT01QSUxFRF9TQU5EQk9YKQogICAgIC8vIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGlu aXRpYWxpemVTYW5kYm94UGFyYW1ldGVycyBzbyB0aGF0IHRoZSBwYXRoIGRvZXMgbm90IGluY2x1 ZGUgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeC4KICAgICAvLyBXZSBkb24ndCB3YW50IHRoZSB1 c2VyIGRpcmVjdG9yeSBzdWZmaXggYmVjYXVzZSB3ZSB3YW50IGFsbCBwcm9jZXNzZXMgb2YgdGhl IHNhbWUgdHlwZSB0byB1c2UgdGhlIHNhbWUgY2FjaGUgZGlyZWN0b3J5LgotICAgIC8vIEZpcnN0 LCBtYWtlIHN1cmUgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCBpcyBlbXB0eSBhdCB0aGlzIHBv aW50LiBUaGlzIGlzIG5vcm1hbGx5IGFscmVhZHkgdGhlIGNhc2UsIGJ1dCBzb21lIGhvc3QKLSAg ICAvLyBwcm9jZXNzZXMgYXJlIHNldHRpbmcgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCwgd2hp Y2ggd2Ugd2lsbCBpbmhlcml0LCBhbmQgb3VyIHNhbmRib3ggZGF0YXZhdWx0IHdpbGwgdGhlbiBl bmQgdXAKLSAgICAvLyBpbnNpZGUgdGhlIGhvc3QgcHJvY2VzcycgY2FjaGUgZm9sZGVyLCB3aGlj aCBpcyB1bmRlc2lyYWJsZS4KLSAgICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChudWxscHRyKTsKICAg ICBTdHJpbmcgZGF0YVZhdWx0UGFyZW50RGlyZWN0b3J5IHsgc2FuZGJveERhdGFWYXVsdFBhcmVu dERpcmVjdG9yeSgpIH07CiAjZWxzZQogICAgIFN0cmluZyBkYXRhVmF1bHRQYXJlbnREaXJlY3Rv cnk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nl c3NQcm94eS5jcHAJKHJldmlzaW9uIDI3MzE5OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcg QEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5j bHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9SdW50aW1lQXBwbGlj YXRpb25DaGVja3MuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKQEAgLTU1LDExICs1NiwxOCBAQCBBdXhpbGlhcnlQcm9jZXNzUHJveHk6On5BdXhpbGlh cnlQcm9jZXNzCiAgICAgfQogfQogCitzdGF0aWMgYm9vbCBpc1dlYktpdFRlc3RCaW5hcnkoKQor eworICAgIFN0cmluZyBidW5kbGVJRCA9IFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRp ZmllcigpOworICAgIHJldHVybiBidW5kbGVJRCA9PSAiY29tLmFwcGxlLldlYktpdC5UZXN0V2Vi S2l0QVBJIl9zIHx8IGJ1bmRsZUlEID09ICJjb20uYXBwbGUuV2ViS2l0LldlYktpdFRlc3RSdW5u ZXIiX3M7Cit9CisKIHZvaWQgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5OjpnZXRMYXVuY2hPcHRpb25z KFByb2Nlc3NMYXVuY2hlcjo6TGF1bmNoT3B0aW9ucyYgbGF1bmNoT3B0aW9ucykKIHsKICAgICBs YXVuY2hPcHRpb25zLnByb2Nlc3NJZGVudGlmaWVyID0gbV9wcm9jZXNzSWRlbnRpZmllcjsKIAot ICAgIGlmIChjb25zdCBjaGFyKiB1c2VyRGlyZWN0b3J5U3VmZml4ID0gZ2V0ZW52KCJESVJIRUxQ RVJfVVNFUl9ESVJfU1VGRklYIikpCisgICAgY29uc3QgY2hhciogdXNlckRpcmVjdG9yeVN1ZmZp eCA9IGdldGVudigiRElSSEVMUEVSX1VTRVJfRElSX1NVRkZJWCIpOworICAgIGlmICh1c2VyRGly ZWN0b3J5U3VmZml4ICYmIGlzV2ViS2l0VGVzdEJpbmFyeSgpKQogICAgICAgICBsYXVuY2hPcHRp b25zLmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmFkZCgidXNlci1kaXJlY3Rvcnktc3VmZml4Il9z LCB1c2VyRGlyZWN0b3J5U3VmZml4KTsKIAogICAgIGlmIChtX2Fsd2F5c1J1bnNBdEJhY2tncm91 bmRQcmlvcml0eSkK 421121 2021-02-20 16:44:42 -0800 2021-02-22 06:08:51 -0800 Patch bug-222233-20210220164441.patch text/plain 5083 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyMDkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IHJlbW92aW5n IHRoZSBjbGllbnQncyBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGNvbmZzdHIKKyAgICAgICAgY2Fj aGUgYW5kIHRlbXAgZm9sZGVyIGZvciBXZWJLaXQgcHJvY2Vzc2VzLCB1bmxlc3MgdGhlIGNsaWVu dCBpcyBhIFdlYktpdCB0ZXN0IGV4ZWN1dGFibGUuIFRoZSBwdXJwb3NlIG9mIHRoZSBmZWF0dXJl CisgICAgICAgIHRvIGxldCBjbGllbnRzIGNvbnRyb2wgdGhlIGNvbmZzdHIgcGF0aHMgb2YgV2Vi S2l0IHByb2Nlc3NlcyB3YXMgb25seSByZWxhdGVkIHRvIFdlYktpdCB0ZXN0aW5nIGJpbmFyaWVz LCBhbmQgc2hvdWxkCisgICAgICAgIGJlIGxpbWl0ZWQgdG8gdGhhdCBjYXNlLiBBbGwgV2ViS2l0 IHByb2Nlc3NlcyBmb3IgY2xpZW50cyBvdGhlciB0aGFuIFdlYktpdCB0ZXN0IGNsaWVudHMgd2ls bCBub3cgZ2V0IHRoZSBkZWZhdWx0IHVzZXIKKyAgICAgICAgZGlyZWN0b3J5IHN1ZmZpeCwgZS5n LiAnY29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5nK2NvbS5hcHBsZS5tZWRpYXJlbW90ZWQnLiBB ZGRpdGlvbmFsbHksIHRoaXMgcGF0Y2ggcmV2ZXJ0cyByMjcxNDE3LAorICAgICAgICB3aGljaCB3 YXMgdGhlIGZpcnN0IGF0dGVtcHQgYXQgZml4aW5nIHRoaXMgY3Jhc2gsIGJ1dCB3YXMgdW5zdWNj ZXNzZnVsIGluIGRvaW5nIHNvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tOgorICAgICAg ICAoV2ViS2l0Ojppbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMpOgorICAgICAgICAoV2ViS2l0 OjpBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6CisgICAgICAgICogVUlQcm9j ZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmlzV2ViS2l0 VGVzdEJpbmFyeSk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3NQcm94eTo6Z2V0 TGF1bmNoT3B0aW9ucyk6CisKIDIwMjEtMDItMjAgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBQQ006IFN0b3JlIGFuZCByZXBvcnQgc291cmNlIHVubGlua2Fi bGUgdG9rZW5zCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vz c01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5 UHJvY2Vzc01hYy5tbQkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQv bWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY2MCw3ICs2NjAs NyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgc2FuZGJv eFBhcmFtZXRlcnMuYWRkUGFyYW1ldGVyKCJfT1NfVkVSU0lPTiIsIG9zVmVyc2lvbi51dGY4KCku ZGF0YSgpKTsKIAogICAgIC8vIFVzZSBwcml2YXRlIHRlbXBvcmFyeSBhbmQgY2FjaGUgZGlyZWN0 b3JpZXMuCi0gICAgX3NldF91c2VyX2Rpcl9zdWZmaXgoRmlsZVN5c3RlbTo6ZmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3RvcnlTdWZmaXgoKSkuZGF0 YSgpKTsKKyAgICBzZXRlbnYoIkRJUkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiLCBGaWxlU3lzdGVt OjpmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9y eVN1ZmZpeCgpKS5kYXRhKCksIDEpOwogICAgIGNoYXIgdGVtcG9yYXJ5RGlyZWN0b3J5W1BBVEhf TUFYXTsKICAgICBpZiAoIWNvbmZzdHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCB0ZW1wb3Jh cnlEaXJlY3RvcnksIHNpemVvZih0ZW1wb3JhcnlEaXJlY3RvcnkpKSkgewogICAgICAgICBXVEZM b2dBbHdheXMoIiVzOiBjb3VsZG4ndCByZXRyaWV2ZSBwcml2YXRlIHRlbXBvcmFyeSBkaXJlY3Rv cnkgcGF0aDogJWRcbiIsIGdldHByb2duYW1lKCksIGVycm5vKTsKQEAgLTcwNiwxMCArNzA2LDYg QEAgdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveAogI2lmIFVTRShDQUNI RV9DT01QSUxFRF9TQU5EQk9YKQogICAgIC8vIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGlu aXRpYWxpemVTYW5kYm94UGFyYW1ldGVycyBzbyB0aGF0IHRoZSBwYXRoIGRvZXMgbm90IGluY2x1 ZGUgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeC4KICAgICAvLyBXZSBkb24ndCB3YW50IHRoZSB1 c2VyIGRpcmVjdG9yeSBzdWZmaXggYmVjYXVzZSB3ZSB3YW50IGFsbCBwcm9jZXNzZXMgb2YgdGhl IHNhbWUgdHlwZSB0byB1c2UgdGhlIHNhbWUgY2FjaGUgZGlyZWN0b3J5LgotICAgIC8vIEZpcnN0 LCBtYWtlIHN1cmUgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCBpcyBlbXB0eSBhdCB0aGlzIHBv aW50LiBUaGlzIGlzIG5vcm1hbGx5IGFscmVhZHkgdGhlIGNhc2UsIGJ1dCBzb21lIGhvc3QKLSAg ICAvLyBwcm9jZXNzZXMgYXJlIHNldHRpbmcgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCwgd2hp Y2ggd2Ugd2lsbCBpbmhlcml0LCBhbmQgb3VyIHNhbmRib3ggZGF0YXZhdWx0IHdpbGwgdGhlbiBl bmQgdXAKLSAgICAvLyBpbnNpZGUgdGhlIGhvc3QgcHJvY2VzcycgY2FjaGUgZm9sZGVyLCB3aGlj aCBpcyB1bmRlc2lyYWJsZS4KLSAgICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChudWxscHRyKTsKICAg ICBTdHJpbmcgZGF0YVZhdWx0UGFyZW50RGlyZWN0b3J5IHsgc2FuZGJveERhdGFWYXVsdFBhcmVu dERpcmVjdG9yeSgpIH07CiAjZWxzZQogICAgIFN0cmluZyBkYXRhVmF1bHRQYXJlbnREaXJlY3Rv cnk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nl c3NQcm94eS5jcHAJKHJldmlzaW9uIDI3MzE5OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcg QEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5j bHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9SdW50aW1lQXBwbGlj YXRpb25DaGVja3MuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKQEAgLTU1LDExICs1NiwyMiBAQCBBdXhpbGlhcnlQcm9jZXNzUHJveHk6On5BdXhpbGlh cnlQcm9jZXNzCiAgICAgfQogfQogCitzdGF0aWMgYm9vbCBpc1dlYktpdFRlc3RCaW5hcnkoKQor eworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIFN0cmluZyBidW5kbGVJRCA9IFdlYkNvcmU6OmFw cGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpOworICAgIHJldHVybiBidW5kbGVJRCA9PSAiY29t LmFwcGxlLldlYktpdC5UZXN0V2ViS2l0QVBJIl9zIHx8IGJ1bmRsZUlEID09ICJjb20uYXBwbGUu V2ViS2l0LldlYktpdFRlc3RSdW5uZXIiX3M7CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNl bmRpZgorfQorCiB2b2lkIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyhQ cm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnMmIGxhdW5jaE9wdGlvbnMpCiB7CiAgICAgbGF1 bmNoT3B0aW9ucy5wcm9jZXNzSWRlbnRpZmllciA9IG1fcHJvY2Vzc0lkZW50aWZpZXI7CiAKLSAg ICBpZiAoY29uc3QgY2hhciogdXNlckRpcmVjdG9yeVN1ZmZpeCA9IGdldGVudigiRElSSEVMUEVS X1VTRVJfRElSX1NVRkZJWCIpKQorICAgIGNvbnN0IGNoYXIqIHVzZXJEaXJlY3RvcnlTdWZmaXgg PSBnZXRlbnYoIkRJUkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiKTsKKyAgICBpZiAodXNlckRpcmVj dG9yeVN1ZmZpeCAmJiBpc1dlYktpdFRlc3RCaW5hcnkoKSkKICAgICAgICAgbGF1bmNoT3B0aW9u cy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5hZGQoInVzZXItZGlyZWN0b3J5LXN1ZmZpeCJfcywg dXNlckRpcmVjdG9yeVN1ZmZpeCk7CiAKICAgICBpZiAobV9hbHdheXNSdW5zQXRCYWNrZ3JvdW5k UHJpb3JpdHkpCg== 421183 2021-02-22 06:08:53 -0800 2021-02-22 06:24:25 -0800 Patch bug-222233-20210222060852.patch text/plain 5929 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyNDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAyLTIyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IHJlbW92aW5n IHRoZSBjbGllbnQncyBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGNvbmZzdHIKKyAgICAgICAgY2Fj aGUgYW5kIHRlbXAgZm9sZGVyIGZvciBXZWJLaXQgcHJvY2Vzc2VzLCB1bmxlc3MgV2ViS2l0IGlz IGJlaW5nIHJ1biBpbiBhIHRlc3RpbmcgY29udGV4dC4gVGhlIHB1cnBvc2Ugb2YgdGhlIGZlYXR1 cmUKKyAgICAgICAgdG8gbGV0IGNsaWVudHMgY29udHJvbCB0aGUgY29uZnN0ciBwYXRocyBvZiBX ZWJLaXQgcHJvY2Vzc2VzIHdhcyBvbmx5IHJlbGF0ZWQgdG8gV2ViS2l0IHRlc3RpbmcgYmluYXJp ZXMsIGFuZCBzaG91bGQKKyAgICAgICAgYmUgbGltaXRlZCB0byB0aGF0IGNhc2UuIEFsbCBXZWJL aXQgcHJvY2Vzc2VzIGZvciBjbGllbnRzIG90aGVyIHRoYW4gV2ViS2l0IHRlc3QgY2xpZW50cyB3 aWxsIG5vdyBnZXQgdGhlIGRlZmF1bHQgdXNlcgorICAgICAgICBkaXJlY3Rvcnkgc3VmZml4LCBl LmcuICdjb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcrY29tLmFwcGxlLm1lZGlhcmVtb3RlZCcu IEFkZGl0aW9uYWxseSwgdGhpcyBwYXRjaCByZXZlcnRzIHIyNzE0MTcsCisgICAgICAgIHdoaWNo IHdhcyB0aGUgZmlyc3QgYXR0ZW1wdCBhdCBmaXhpbmcgdGhpcyBjcmFzaCwgYnV0IHdhcyB1bnN1 Y2Nlc3NmdWwgaW4gZG9pbmcgc28uCisKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxp dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tOgorICAgICAgICAo V2ViS2l0Ojppc1BsYXRmb3JtQmluYXJ5KToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZUlu aXRpYWxpemVyRGVsZWdhdGU6OmdldEV4dHJhSW5pdGlhbGl6YXRpb25EYXRhKToKKyAgICAgICAg KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6Omlu aXRpYWxpemVTYW5kYm94UGFyYW1ldGVycyk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVBy b2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KToKKwogMjAyMS0wMi0yMiAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NPVVBdIEFkZCBzdXBwb3J0 IGZvciBsaWJzb3VwMwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxp dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2Vy dmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNl L1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1Nl cnZpY2VFbnRyeVBvaW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAjaW1w b3J0ICJBcmd1bWVudENvZGVyc0NGLmgiCiAjaW1wb3J0ICJTYW5kYm94VXRpbGl0aWVzLmgiCiAj aW1wb3J0ICJYUENTZXJ2aWNlRW50cnlQb2ludC5oIgorI2ltcG9ydCA8S2VybmVsL2tlcm4vY3Nf YmxvYnMuaD4KICNpbXBvcnQgPFdlYkNvcmUvUHJvY2Vzc0lkZW50aWZpZXIuaD4KICNpbXBvcnQg PHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KICNpbXBvcnQgPHd0Zi9zcGkvZGFyd2luL1NhbmRi b3hTUEkuaD4KQEAgLTEwMCw2ICsxMDEsMTUgQEAgYm9vbCBYUENTZXJ2aWNlSW5pdGlhbGl6ZXJE ZWxlZ2F0ZTo6Z2V0QwogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0aWMgYm9vbCBpc1BsYXRm b3JtQmluYXJ5KCkKK3sKKyNpZiBQTEFURk9STShNQUMpCisgICAgcmV0dXJuIFNlY1Rhc2tHZXRD b2RlU2lnblN0YXR1cyhhZG9wdENGKFNlY1Rhc2tDcmVhdGVGcm9tU2VsZihrQ0ZBbGxvY2F0b3JE ZWZhdWx0KSkuZ2V0KCkpICYgQ1NfUExBVEZPUk1fUEFUSDsKKyNlbHNlCisgICAgcmV0dXJuIGZh bHNlOworI2VuZGlmCit9CisKIGJvb2wgWFBDU2VydmljZUluaXRpYWxpemVyRGVsZWdhdGU6Omdl dEV4dHJhSW5pdGlhbGl6YXRpb25EYXRhKEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiBleHRyYUlu aXRpYWxpemF0aW9uRGF0YSkKIHsKICAgICB4cGNfb2JqZWN0X3QgZXh0cmFEYXRhSW5pdGlhbGl6 YXRpb25EYXRhT2JqZWN0ID0geHBjX2RpY3Rpb25hcnlfZ2V0X3ZhbHVlKG1faW5pdGlhbGl6ZXJN ZXNzYWdlLCAiZXh0cmEtaW5pdGlhbGl6YXRpb24tZGF0YSIpOwpAQCAtMTIxLDcgKzEzMSwxMSBA QCBib29sIFhQQ1NlcnZpY2VJbml0aWFsaXplckRlbGVnYXRlOjpnZXRFCiAgICAgaWYgKCFpc1By ZXdhcm1lZFByb2Nlc3MuaXNFbXB0eSgpKQogICAgICAgICBleHRyYUluaXRpYWxpemF0aW9uRGF0 YS5hZGQoImlzLXByZXdhcm1lZCJfcywgaXNQcmV3YXJtZWRQcm9jZXNzKTsKIAotICAgIGlmICgh aXNDbGllbnRTYW5kYm94ZWQoKSkgeworICAgIC8vIFRoZSBhYmlsaXR5IGZvciB0aGUgV2ViS2l0 IGNsaWVudCB0byBjb250cm9sIHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXggc2hvdWxkIG9ubHkg YmUgcG9zc2libGUgZm9yIFdlYktpdCB0ZXN0IGNsaWVudHMsIGxpa2UKKyAgICAvLyBUZXN0V2Vi S2l0QVBJIGFuZCBXZWJLaXRUZXN0UnVubmVyLCBzaW5jZSB0aGlzIGNhbiBnaXZlIHRoZSBjbGll bnQgcmlnaHRzIHRvIGFjY2VzcyBmaWxlcyB3aXRoaW4gdGhlIGNvbmZzdHIgdGVtcCBhbmQgY2Fj aGUKKyAgICAvLyBkaXJlY3RvcmllcyBvZiB0aGUgV2ViS2l0IHByb2Nlc3MuIFRoZSBXZWJLaXQg dGVzdCBjbGllbnRzIGFyZSBub3Qgc2FuZGJveGVkLCBhbmQgYXJlIG5vdCBydW5uaW5nIHRlc3Rz IGFnYWluc3Qgc3lzdGVtIFdlYktpdCwKKyAgICAvLyB3aGljaCBjYW4gYmUgdXNlZCB0byBkZXRl cm1pbmUgaWYgdGhpcyBzaG91bGQgYmUgYWxsb3dlZC4KKyAgICBpZiAoIWlzQ2xpZW50U2FuZGJv eGVkKCkgJiYgIWlzUGxhdGZvcm1CaW5hcnkoKSkgewogICAgICAgICBTdHJpbmcgdXNlckRpcmVj dG9yeVN1ZmZpeCA9IHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXh0cmFEYXRhSW5pdGlhbGl6 YXRpb25EYXRhT2JqZWN0LCAidXNlci1kaXJlY3Rvcnktc3VmZml4Iik7CiAgICAgICAgIGlmICgh dXNlckRpcmVjdG9yeVN1ZmZpeC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBleHRyYUluaXRpYWxp emF0aW9uRGF0YS5hZGQoInVzZXItZGlyZWN0b3J5LXN1ZmZpeCJfcywgdXNlckRpcmVjdG9yeVN1 ZmZpeCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJv Y2Vzc01hYy5tbQkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvbWFj L0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY2MCw3ICs2NjAsNyBA QCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgc2FuZGJveFBh cmFtZXRlcnMuYWRkUGFyYW1ldGVyKCJfT1NfVkVSU0lPTiIsIG9zVmVyc2lvbi51dGY4KCkuZGF0 YSgpKTsKIAogICAgIC8vIFVzZSBwcml2YXRlIHRlbXBvcmFyeSBhbmQgY2FjaGUgZGlyZWN0b3Jp ZXMuCi0gICAgX3NldF91c2VyX2Rpcl9zdWZmaXgoRmlsZVN5c3RlbTo6ZmlsZVN5c3RlbVJlcHJl c2VudGF0aW9uKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3RvcnlTdWZmaXgoKSkuZGF0YSgp KTsKKyAgICBzZXRlbnYoIkRJUkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiLCBGaWxlU3lzdGVtOjpm aWxlU3lzdGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9yeVN1 ZmZpeCgpKS5kYXRhKCksIDEpOwogICAgIGNoYXIgdGVtcG9yYXJ5RGlyZWN0b3J5W1BBVEhfTUFY XTsKICAgICBpZiAoIWNvbmZzdHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCB0ZW1wb3JhcnlE aXJlY3RvcnksIHNpemVvZih0ZW1wb3JhcnlEaXJlY3RvcnkpKSkgewogICAgICAgICBXVEZMb2dB bHdheXMoIiVzOiBjb3VsZG4ndCByZXRyaWV2ZSBwcml2YXRlIHRlbXBvcmFyeSBkaXJlY3Rvcnkg cGF0aDogJWRcbiIsIGdldHByb2duYW1lKCksIGVycm5vKTsKQEAgLTcwNiwxMCArNzA2LDYgQEAg dm9pZCBBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveAogI2lmIFVTRShDQUNIRV9D T01QSUxFRF9TQU5EQk9YKQogICAgIC8vIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGluaXRp YWxpemVTYW5kYm94UGFyYW1ldGVycyBzbyB0aGF0IHRoZSBwYXRoIGRvZXMgbm90IGluY2x1ZGUg dGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeC4KICAgICAvLyBXZSBkb24ndCB3YW50IHRoZSB1c2Vy IGRpcmVjdG9yeSBzdWZmaXggYmVjYXVzZSB3ZSB3YW50IGFsbCBwcm9jZXNzZXMgb2YgdGhlIHNh bWUgdHlwZSB0byB1c2UgdGhlIHNhbWUgY2FjaGUgZGlyZWN0b3J5LgotICAgIC8vIEZpcnN0LCBt YWtlIHN1cmUgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCBpcyBlbXB0eSBhdCB0aGlzIHBvaW50 LiBUaGlzIGlzIG5vcm1hbGx5IGFscmVhZHkgdGhlIGNhc2UsIGJ1dCBzb21lIGhvc3QKLSAgICAv LyBwcm9jZXNzZXMgYXJlIHNldHRpbmcgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCwgd2hpY2gg d2Ugd2lsbCBpbmhlcml0LCBhbmQgb3VyIHNhbmRib3ggZGF0YXZhdWx0IHdpbGwgdGhlbiBlbmQg dXAKLSAgICAvLyBpbnNpZGUgdGhlIGhvc3QgcHJvY2VzcycgY2FjaGUgZm9sZGVyLCB3aGljaCBp cyB1bmRlc2lyYWJsZS4KLSAgICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChudWxscHRyKTsKICAgICBT dHJpbmcgZGF0YVZhdWx0UGFyZW50RGlyZWN0b3J5IHsgc2FuZGJveERhdGFWYXVsdFBhcmVudERp cmVjdG9yeSgpIH07CiAjZWxzZQogICAgIFN0cmluZyBkYXRhVmF1bHRQYXJlbnREaXJlY3Rvcnk7 Cg== 421184 2021-02-22 06:23:54 -0800 2021-02-22 11:56:03 -0800 Patch bug-222233-20210222062353.patch text/plain 5876 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyNDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAyLTIyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IHJlbW92aW5n IHRoZSBjbGllbnQncyBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGNvbmZzdHIKKyAgICAgICAgY2Fj aGUgYW5kIHRlbXAgZm9sZGVyIGZvciBXZWJLaXQgcHJvY2Vzc2VzLCB1bmxlc3MgV2ViS2l0IGlz IGJlaW5nIHJ1biBpbiBhIHRlc3RpbmcgY29udGV4dC4gVGhlIHB1cnBvc2Ugb2YgdGhlIGZlYXR1 cmUKKyAgICAgICAgdG8gbGV0IGNsaWVudHMgY29udHJvbCB0aGUgY29uZnN0ciBwYXRocyBvZiBX ZWJLaXQgcHJvY2Vzc2VzIHdhcyBvbmx5IHJlbGF0ZWQgdG8gV2ViS2l0IHRlc3RpbmcgYmluYXJp ZXMsIGFuZCBzaG91bGQKKyAgICAgICAgYmUgbGltaXRlZCB0byB0aGF0IGNhc2UuIEFsbCBXZWJL aXQgcHJvY2Vzc2VzIGZvciBjbGllbnRzIG90aGVyIHRoYW4gV2ViS2l0IHRlc3QgY2xpZW50cyB3 aWxsIG5vdyBnZXQgdGhlIGRlZmF1bHQgdXNlcgorICAgICAgICBkaXJlY3Rvcnkgc3VmZml4LCBl LmcuICdjb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcrY29tLmFwcGxlLm1lZGlhcmVtb3RlZCcu IEFkZGl0aW9uYWxseSwgdGhpcyBwYXRjaCByZXZlcnRzIHIyNzE0MTcsCisgICAgICAgIHdoaWNo IHdhcyB0aGUgZmlyc3QgYXR0ZW1wdCBhdCBmaXhpbmcgdGhpcyBjcmFzaCwgYnV0IHdhcyB1bnN1 Y2Nlc3NmdWwgaW4gZG9pbmcgc28uCisKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxp dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tOgorICAgICAgICAo V2ViS2l0Ojppc1BsYXRmb3JtQmluYXJ5KToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZUlu aXRpYWxpemVyRGVsZWdhdGU6OmdldEV4dHJhSW5pdGlhbGl6YXRpb25EYXRhKToKKyAgICAgICAg KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6Omlu aXRpYWxpemVTYW5kYm94UGFyYW1ldGVycyk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVBy b2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KToKKwogMjAyMS0wMi0yMiAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NPVVBdIEFkZCBzdXBwb3J0 IGZvciBsaWJzb3VwMwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxp dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2Vy dmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQkocmV2aXNpb24gMjczMTk4KQorKysgU291cmNl L1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1Nl cnZpY2VFbnRyeVBvaW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwxMCBAQAogI2lt cG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgogI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4v U2FuZGJveFNQSS5oPgogCisjaWYgUExBVEZPUk0oTUFDKQorI2ltcG9ydCA8S2VybmVsL2tlcm4v Y3NfYmxvYnMuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCkBAIC0xMDAsNiArMTA0LDE1IEBAIGJvb2wgWFBDU2VydmljZUluaXRpYWxp emVyRGVsZWdhdGU6OmdldEMKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgaXNQ bGF0Zm9ybUJpbmFyeSgpCit7CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHJldHVybiBTZWNUYXNr R2V0Q29kZVNpZ25TdGF0dXMoYWRvcHRDRihTZWNUYXNrQ3JlYXRlRnJvbVNlbGYoa0NGQWxsb2Nh dG9yRGVmYXVsdCkpLmdldCgpKSAmIENTX1BMQVRGT1JNX1BBVEg7CisjZWxzZQorICAgIHJldHVy biBmYWxzZTsKKyNlbmRpZgorfQorCiBib29sIFhQQ1NlcnZpY2VJbml0aWFsaXplckRlbGVnYXRl OjpnZXRFeHRyYUluaXRpYWxpemF0aW9uRGF0YShIYXNoTWFwPFN0cmluZywgU3RyaW5nPiYgZXh0 cmFJbml0aWFsaXphdGlvbkRhdGEpCiB7CiAgICAgeHBjX29iamVjdF90IGV4dHJhRGF0YUluaXRp YWxpemF0aW9uRGF0YU9iamVjdCA9IHhwY19kaWN0aW9uYXJ5X2dldF92YWx1ZShtX2luaXRpYWxp emVyTWVzc2FnZSwgImV4dHJhLWluaXRpYWxpemF0aW9uLWRhdGEiKTsKQEAgLTEyMSw3ICsxMzQs MTEgQEAgYm9vbCBYUENTZXJ2aWNlSW5pdGlhbGl6ZXJEZWxlZ2F0ZTo6Z2V0RQogICAgIGlmICgh aXNQcmV3YXJtZWRQcm9jZXNzLmlzRW1wdHkoKSkKICAgICAgICAgZXh0cmFJbml0aWFsaXphdGlv bkRhdGEuYWRkKCJpcy1wcmV3YXJtZWQiX3MsIGlzUHJld2FybWVkUHJvY2Vzcyk7CiAKLSAgICBp ZiAoIWlzQ2xpZW50U2FuZGJveGVkKCkpIHsKKyAgICAvLyBUaGUgYWJpbGl0eSBmb3IgdGhlIFdl YktpdCBjbGllbnQgdG8gY29udHJvbCB0aGUgdXNlciBkaXJlY3Rvcnkgc3VmZml4IHNob3VsZCBv bmx5IGJlIHBvc3NpYmxlIGZvciBXZWJLaXQgdGVzdCBjbGllbnRzLCBsaWtlCisgICAgLy8gVGVz dFdlYktpdEFQSSBhbmQgV2ViS2l0VGVzdFJ1bm5lciwgc2luY2UgdGhpcyBjYW4gZ2l2ZSB0aGUg Y2xpZW50IHJpZ2h0cyB0byBhY2Nlc3MgZmlsZXMgd2l0aGluIHRoZSBjb25mc3RyIHRlbXAgYW5k IGNhY2hlCisgICAgLy8gZGlyZWN0b3JpZXMgb2YgdGhlIFdlYktpdCBwcm9jZXNzLiBUaGUgV2Vi S2l0IHRlc3QgY2xpZW50cyBhcmUgbm90IHNhbmRib3hlZCwgYW5kIGFyZSBub3QgcnVubmluZyB0 ZXN0cyBhZ2FpbnN0IHN5c3RlbSBXZWJLaXQsCisgICAgLy8gd2hpY2ggY2FuIGJlIHVzZWQgdG8g ZGV0ZXJtaW5lIGlmIHRoaXMgc2hvdWxkIGJlIGFsbG93ZWQuCisgICAgaWYgKCFpc0NsaWVudFNh bmRib3hlZCgpICYmICFpc1BsYXRmb3JtQmluYXJ5KCkpIHsKICAgICAgICAgU3RyaW5nIHVzZXJE aXJlY3RvcnlTdWZmaXggPSB4cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKGV4dHJhRGF0YUluaXRp YWxpemF0aW9uRGF0YU9iamVjdCwgInVzZXItZGlyZWN0b3J5LXN1ZmZpeCIpOwogICAgICAgICBp ZiAoIXVzZXJEaXJlY3RvcnlTdWZmaXguaXNFbXB0eSgpKQogICAgICAgICAgICAgZXh0cmFJbml0 aWFsaXphdGlvbkRhdGEuYWRkKCJ1c2VyLWRpcmVjdG9yeS1zdWZmaXgiX3MsIHVzZXJEaXJlY3Rv cnlTdWZmaXgpOwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nl c3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFy eVByb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI3MzE5OCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVk L21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NjAsNyArNjYw LDcgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKAogICAgIHNhbmRi b3hQYXJhbWV0ZXJzLmFkZFBhcmFtZXRlcigiX09TX1ZFUlNJT04iLCBvc1ZlcnNpb24udXRmOCgp LmRhdGEoKSk7CiAKICAgICAvLyBVc2UgcHJpdmF0ZSB0ZW1wb3JhcnkgYW5kIGNhY2hlIGRpcmVj dG9yaWVzLgotICAgIF9zZXRfdXNlcl9kaXJfc3VmZml4KEZpbGVTeXN0ZW06OmZpbGVTeXN0ZW1S ZXByZXNlbnRhdGlvbihzYW5kYm94UGFyYW1ldGVycy51c2VyRGlyZWN0b3J5U3VmZml4KCkpLmRh dGEoKSk7CisgICAgc2V0ZW52KCJESVJIRUxQRVJfVVNFUl9ESVJfU1VGRklYIiwgRmlsZVN5c3Rl bTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHNhbmRib3hQYXJhbWV0ZXJzLnVzZXJEaXJlY3Rv cnlTdWZmaXgoKSkuZGF0YSgpLCAxKTsKICAgICBjaGFyIHRlbXBvcmFyeURpcmVjdG9yeVtQQVRI X01BWF07CiAgICAgaWYgKCFjb25mc3RyKF9DU19EQVJXSU5fVVNFUl9URU1QX0RJUiwgdGVtcG9y YXJ5RGlyZWN0b3J5LCBzaXplb2YodGVtcG9yYXJ5RGlyZWN0b3J5KSkpIHsKICAgICAgICAgV1RG TG9nQWx3YXlzKCIlczogY291bGRuJ3QgcmV0cmlldmUgcHJpdmF0ZSB0ZW1wb3JhcnkgZGlyZWN0 b3J5IHBhdGg6ICVkXG4iLCBnZXRwcm9nbmFtZSgpLCBlcnJubyk7CkBAIC03MDYsMTAgKzcwNiw2 IEBAIHZvaWQgQXV4aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gKICNpZiBVU0UoQ0FD SEVfQ09NUElMRURfU0FOREJPWCkKICAgICAvLyBUaGlzIG11c3QgYmUgY2FsbGVkIGJlZm9yZSBp bml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMgc28gdGhhdCB0aGUgcGF0aCBkb2VzIG5vdCBpbmNs dWRlIHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXguCiAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0aGUg dXNlciBkaXJlY3Rvcnkgc3VmZml4IGJlY2F1c2Ugd2Ugd2FudCBhbGwgcHJvY2Vzc2VzIG9mIHRo ZSBzYW1lIHR5cGUgdG8gdXNlIHRoZSBzYW1lIGNhY2hlIGRpcmVjdG9yeS4KLSAgICAvLyBGaXJz dCwgbWFrZSBzdXJlIHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXggaXMgZW1wdHkgYXQgdGhpcyBw b2ludC4gVGhpcyBpcyBub3JtYWxseSBhbHJlYWR5IHRoZSBjYXNlLCBidXQgc29tZSBob3N0Ci0g ICAgLy8gcHJvY2Vzc2VzIGFyZSBzZXR0aW5nIHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXgsIHdo aWNoIHdlIHdpbGwgaW5oZXJpdCwgYW5kIG91ciBzYW5kYm94IGRhdGF2YXVsdCB3aWxsIHRoZW4g ZW5kIHVwCi0gICAgLy8gaW5zaWRlIHRoZSBob3N0IHByb2Nlc3MnIGNhY2hlIGZvbGRlciwgd2hp Y2ggaXMgdW5kZXNpcmFibGUuCi0gICAgX3NldF91c2VyX2Rpcl9zdWZmaXgobnVsbHB0cik7CiAg ICAgU3RyaW5nIGRhdGFWYXVsdFBhcmVudERpcmVjdG9yeSB7IHNhbmRib3hEYXRhVmF1bHRQYXJl bnREaXJlY3RvcnkoKSB9OwogI2Vsc2UKICAgICBTdHJpbmcgZGF0YVZhdWx0UGFyZW50RGlyZWN0 b3J5Owo= 421219 2021-02-22 11:56:07 -0800 2021-02-22 13:08:20 -0800 Patch bug-222233-20210222115606.patch text/plain 4372 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyNDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAyLTIyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MjYxNjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBXZWJLaXQgY2xpZW50IHByb3ZpZGVzIGEgdXNlciBkaXJlY3Rvcnkgc3Vm Zml4IGluIHRoZSBwcm9jZXNzIGluaXRpYWxpemF0aW9uIHBhcmFtZXRlcnMsIGNvbmZzdHIgd2l0 aCB0aGUgbmV3CisgICAgICAgIHVzZXIgc3VmZml4IGFwcGxpZWQgd2lsbCBmYWlsIHRvIGNyZWF0 ZSB0aGUgZnVsbCBkaXJlY3RvcnkgcGF0aCBpZiBpdCBkb2VzIG5vdCBleGlzdCwgYW5kIHJldHVy biBhbiBlbXB0eSByZXN1bHQuCisgICAgICAgIFRoaXMgd2lsbCBsZWFkIHRvIGVtcHR5IHBhdGhz IGluIHRoZSBzYW5kYm94IHBhcmFtZXRlcnMsIHdoaWNoIHdpbGwgY2F1c2UgdGhlIHNhbmRib3gg dG8gZmFpbCB0byBjb21waWxlLCB3aGljaCB3aWxsCisgICAgICAgIGV2ZW50dWFsbHkgY3Jhc2gg dGhlIFdlYktpdCBwcm9jZXNzLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGJ5IG1ha2luZyBz dXJlIHRoZSBuZXcgdXNlciBkaXJlY3Rvcnkgc3VmZml4IGRvZXMgbm90CisgICAgICAgIHJlcHJl c2VudCBhIHBhdGgsIHNpbmNlIGNvbmZzdHIgaXMgbm90IGFibGUgdG8gaGFuZGxlIHVzZXIgZGly ZWN0b3J5IHN1ZmZpeGVzIGNvbnRhaW5pbmcgcGF0aHMgdGhhdCBkbyBub3QgZXhpc3QuCisgICAg ICAgIEFkZGl0aW9uYWxseSwgdGhpcyBwYXRjaCByZXZlcnRzIHIyNzE0MTcsIHdoaWNoIHdhcyB0 aGUgZmlyc3QgYXR0ZW1wdCBhdCBmaXhpbmcgdGhpcyBjcmFzaCwgYnV0IHdhcyB1bnN1Y2Nlc3Nm dWwgaW4KKyAgICAgICAgZG9pbmcgc28uCisKKyAgICAgICAgKiBTaGFyZWQvbWFjL0F1eGlsaWFy eVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVTYW5kYm94UGFyYW1l dGVycyk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5k Ym94KToKKwogMjAyMS0wMi0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW1NPVVBdIEFkZCBzdXBwb3J0IGZvciBsaWJzb3VwMwpJbmRleDog U291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHJl dmlzaW9uIDI3MzE5OCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9j ZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MzksOSArNjM5LDEzIEBAIHN0YXRpYyB2b2lk IGluaXRpYWxpemVTYW5kYm94UGFyYW1ldGVycygKICAgICAvLyBWZXJpZnkgdXNlciBkaXJlY3Rv cnkgc3VmZml4LgogICAgIGlmIChzYW5kYm94UGFyYW1ldGVycy51c2VyRGlyZWN0b3J5U3VmZml4 KCkuaXNOdWxsKCkpIHsKICAgICAgICAgYXV0byB1c2VyRGlyZWN0b3J5U3VmZml4ID0gcGFyYW1l dGVycy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5maW5kKCJ1c2VyLWRpcmVjdG9yeS1zdWZmaXgi KTsKLSAgICAgICAgaWYgKHVzZXJEaXJlY3RvcnlTdWZmaXggIT0gcGFyYW1ldGVycy5leHRyYUlu aXRpYWxpemF0aW9uRGF0YS5lbmQoKSkKLSAgICAgICAgICAgIHNhbmRib3hQYXJhbWV0ZXJzLnNl dFVzZXJEaXJlY3RvcnlTdWZmaXgoW21ha2VTdHJpbmcodXNlckRpcmVjdG9yeVN1ZmZpeC0+dmFs dWUsICcvJywgU3RyaW5nKFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0p KSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dKTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIGlm ICh1c2VyRGlyZWN0b3J5U3VmZml4ICE9IHBhcmFtZXRlcnMuZXh0cmFJbml0aWFsaXphdGlvbkRh dGEuZW5kKCkpIHsKKyAgICAgICAgICAgIFN0cmluZyBzdWZmaXggPSB1c2VyRGlyZWN0b3J5U3Vm Zml4LT52YWx1ZTsKKyAgICAgICAgICAgIGF1dG8gZmlyc3RQYXRoU2VwYXJhdG9yID0gc3VmZml4 LmZpbmQoIi8iKTsKKyAgICAgICAgICAgIGlmIChmaXJzdFBhdGhTZXBhcmF0b3IgIT0gbm90Rm91 bmQpCisgICAgICAgICAgICAgICAgc3VmZml4LnRydW5jYXRlKGZpcnN0UGF0aFNlcGFyYXRvcik7 CisgICAgICAgICAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRVc2VyRGlyZWN0b3J5U3VmZml4KHN1 ZmZpeCk7CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBTdHJpbmcgY2xpZW50SWRlbnRp ZmllciA9IGNvZGVTaWduaW5nSWRlbnRpZmllcihwYXJhbWV0ZXJzLmNvbm5lY3Rpb25JZGVudGlm aWVyLnhwY0Nvbm5lY3Rpb24uZ2V0KCkpOwogICAgICAgICAgICAgaWYgKGNsaWVudElkZW50aWZp ZXIuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgY2xpZW50SWRlbnRpZmllciA9IHBhcmFtZXRl cnMuY2xpZW50SWRlbnRpZmllcjsKQEAgLTY2MCw3ICs2NjQsNyBAQCBzdGF0aWMgdm9pZCBpbml0 aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgc2FuZGJveFBhcmFtZXRlcnMuYWRkUGFyYW1l dGVyKCJfT1NfVkVSU0lPTiIsIG9zVmVyc2lvbi51dGY4KCkuZGF0YSgpKTsKIAogICAgIC8vIFVz ZSBwcml2YXRlIHRlbXBvcmFyeSBhbmQgY2FjaGUgZGlyZWN0b3JpZXMuCi0gICAgX3NldF91c2Vy X2Rpcl9zdWZmaXgoRmlsZVN5c3RlbTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHNhbmRib3hQ YXJhbWV0ZXJzLnVzZXJEaXJlY3RvcnlTdWZmaXgoKSkuZGF0YSgpKTsKKyAgICBzZXRlbnYoIkRJ UkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiLCBGaWxlU3lzdGVtOjpmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb24oc2FuZGJveFBhcmFtZXRlcnMudXNlckRpcmVjdG9yeVN1ZmZpeCgpKS5kYXRhKCksIDEp OwogICAgIGNoYXIgdGVtcG9yYXJ5RGlyZWN0b3J5W1BBVEhfTUFYXTsKICAgICBpZiAoIWNvbmZz dHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCB0ZW1wb3JhcnlEaXJlY3RvcnksIHNpemVvZih0 ZW1wb3JhcnlEaXJlY3RvcnkpKSkgewogICAgICAgICBXVEZMb2dBbHdheXMoIiVzOiBjb3VsZG4n dCByZXRyaWV2ZSBwcml2YXRlIHRlbXBvcmFyeSBkaXJlY3RvcnkgcGF0aDogJWRcbiIsIGdldHBy b2duYW1lKCksIGVycm5vKTsKQEAgLTcwNiwxMCArNzEwLDYgQEAgdm9pZCBBdXhpbGlhcnlQcm9j ZXNzOjppbml0aWFsaXplU2FuZGJveAogI2lmIFVTRShDQUNIRV9DT01QSUxFRF9TQU5EQk9YKQog ICAgIC8vIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGluaXRpYWxpemVTYW5kYm94UGFyYW1l dGVycyBzbyB0aGF0IHRoZSBwYXRoIGRvZXMgbm90IGluY2x1ZGUgdGhlIHVzZXIgZGlyZWN0b3J5 IHN1ZmZpeC4KICAgICAvLyBXZSBkb24ndCB3YW50IHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXgg YmVjYXVzZSB3ZSB3YW50IGFsbCBwcm9jZXNzZXMgb2YgdGhlIHNhbWUgdHlwZSB0byB1c2UgdGhl IHNhbWUgY2FjaGUgZGlyZWN0b3J5LgotICAgIC8vIEZpcnN0LCBtYWtlIHN1cmUgdGhlIHVzZXIg ZGlyZWN0b3J5IHN1ZmZpeCBpcyBlbXB0eSBhdCB0aGlzIHBvaW50LiBUaGlzIGlzIG5vcm1hbGx5 IGFscmVhZHkgdGhlIGNhc2UsIGJ1dCBzb21lIGhvc3QKLSAgICAvLyBwcm9jZXNzZXMgYXJlIHNl dHRpbmcgdGhlIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCwgd2hpY2ggd2Ugd2lsbCBpbmhlcml0LCBh bmQgb3VyIHNhbmRib3ggZGF0YXZhdWx0IHdpbGwgdGhlbiBlbmQgdXAKLSAgICAvLyBpbnNpZGUg dGhlIGhvc3QgcHJvY2VzcycgY2FjaGUgZm9sZGVyLCB3aGljaCBpcyB1bmRlc2lyYWJsZS4KLSAg ICBfc2V0X3VzZXJfZGlyX3N1ZmZpeChudWxscHRyKTsKICAgICBTdHJpbmcgZGF0YVZhdWx0UGFy ZW50RGlyZWN0b3J5IHsgc2FuZGJveERhdGFWYXVsdFBhcmVudERpcmVjdG9yeSgpIH07CiAjZWxz ZQogICAgIFN0cmluZyBkYXRhVmF1bHRQYXJlbnREaXJlY3Rvcnk7Cg== 421252 2021-02-22 15:51:51 -0800 2021-02-23 05:31:00 -0800 Patch bug-222233-20210222155150.patch text/plain 1688 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAyLTIyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKworICAgICAgICBVbnJldmlld2Vk LCBhZGRyZXNzIGFkZGl0aW9uYWwgcmV2aWV3IGZlZWRiYWNrLgorCisgICAgICAgIEFkZCBjb21t ZW50IGFuZCBsb2dnaW5nIHdoZW4gdGhlIFdlYktpdCBjbGllbnQgaXMgc2V0dGluZyB0aGUgdXNl ciBkaXJlY3Rvcnkgc3VmZml4LgorCisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9j ZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMp OgorCiAyMDIxLTAyLTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgW0NvY29hXSBBZGQgV0tXZWJWaWV3IHNlc3Npb24gcmVzdG9yYXRpb24gQVBJCkluZGV4OiBT b3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQkocmV2 aXNpb24gMjczMjgzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nl c3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY0MSw2ICs2NDEsOCBAQCBzdGF0aWMgdm9pZCBp bml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMoCiAgICAgICAgIGF1dG8gdXNlckRpcmVjdG9yeVN1 ZmZpeCA9IHBhcmFtZXRlcnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZmluZCgidXNlci1kaXJl Y3Rvcnktc3VmZml4Iik7CiAgICAgICAgIGlmICh1c2VyRGlyZWN0b3J5U3VmZml4ICE9IHBhcmFt ZXRlcnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZW5kKCkpIHsKICAgICAgICAgICAgIFN0cmlu ZyBzdWZmaXggPSB1c2VyRGlyZWN0b3J5U3VmZml4LT52YWx1ZTsKKyAgICAgICAgICAgIFdURkxv Z0Fsd2F5cygiV2ViS2l0IGNsaWVudCBpcyBzZXR0aW5nIHVzZXIgZGlyZWN0b3J5IHN1ZmZpeDog JXMiLCBzdWZmaXgudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAvLyBNYWtlIHN1cmUgdGhl IHVzZXIgZGlyZWN0b3J5IHN1ZmZpeCBpcyBub3QgYSBwYXRoLCBzaW5jZSBjb25mc3RyIGRvZXMg bm90IGhhbmRsZSB0aGF0IHdoZW4gdGhlIHBhdGggZG9lcyBub3QgZXhpc3QuCiAgICAgICAgICAg ICBhdXRvIGZpcnN0UGF0aFNlcGFyYXRvciA9IHN1ZmZpeC5maW5kKCIvIik7CiAgICAgICAgICAg ICBpZiAoZmlyc3RQYXRoU2VwYXJhdG9yICE9IG5vdEZvdW5kKQogICAgICAgICAgICAgICAgIHN1 ZmZpeC50cnVuY2F0ZShmaXJzdFBhdGhTZXBhcmF0b3IpOwo= 421304 2021-02-23 05:30:13 -0800 2021-02-23 05:58:40 -0800 Patch bug-222233-20210223053012.patch text/plain 2060 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMyODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAyLTIyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENyYXNoIHVuZGVy IEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMzMKKworICAgICAgICBVbnJldmlld2Vk LCBhZGRyZXNzIGFkZGl0aW9uYWwgcmV2aWV3IGZlZWRiYWNrLgorCisgICAgICAgIEFkZCBjb21t ZW50IGFuZCBsb2dnaW5nIHdoZW4gdGhlIFdlYktpdCBjbGllbnQgaXMgc2V0dGluZyB0aGUgdXNl ciBkaXJlY3Rvcnkgc3VmZml4LgorCisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9j ZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplU2FuZGJveFBhcmFtZXRlcnMp OgorCiAyMDIxLTAyLTIyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgW0NvY29hXSBBZGQgV0tXZWJWaWV3IHNlc3Npb24gcmVzdG9yYXRpb24gQVBJCkluZGV4OiBT b3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQkocmV2 aXNpb24gMjczMjgzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nl c3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY0MSw5ICs2NDEsMTMgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKAogICAgICAgICBhdXRvIHVzZXJEaXJlY3RvcnlT dWZmaXggPSBwYXJhbWV0ZXJzLmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmZpbmQoInVzZXItZGly ZWN0b3J5LXN1ZmZpeCIpOwogICAgICAgICBpZiAodXNlckRpcmVjdG9yeVN1ZmZpeCAhPSBwYXJh bWV0ZXJzLmV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmVuZCgpKSB7CiAgICAgICAgICAgICBTdHJp bmcgc3VmZml4ID0gdXNlckRpcmVjdG9yeVN1ZmZpeC0+dmFsdWU7CisgICAgICAgICAgICBXVEZM b2dBbHdheXMoIldlYktpdCBjbGllbnQgaXMgcmVxdWVzdGluZyB1c2VyIGRpcmVjdG9yeSBzdWZm aXg6ICVzIiwgc3VmZml4LnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgLy8gTWFrZSBzdXJl IHRoZSB1c2VyIGRpcmVjdG9yeSBzdWZmaXggaXMgbm90IGEgcGF0aCwgc2luY2UgY29uZnN0ciB3 aWxsIGZhaWwgd2hlbiB0aGUgcGF0aCBkb2VzIG5vdCBleGlzdC4KICAgICAgICAgICAgIGF1dG8g Zmlyc3RQYXRoU2VwYXJhdG9yID0gc3VmZml4LmZpbmQoIi8iKTsKLSAgICAgICAgICAgIGlmIChm aXJzdFBhdGhTZXBhcmF0b3IgIT0gbm90Rm91bmQpCisgICAgICAgICAgICBpZiAoZmlyc3RQYXRo U2VwYXJhdG9yICE9IG5vdEZvdW5kKSB7CiAgICAgICAgICAgICAgICAgc3VmZml4LnRydW5jYXRl KGZpcnN0UGF0aFNlcGFyYXRvcik7CisgICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJVc2Vy IGRpcmVjdG9yeSBzdWZmaXggaXMgYSBwYXRoLCB3aGljaCB3aWxsIGJlIHRydW5jYXRlZDogJXMi LCBzdWZmaXgudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBzYW5k Ym94UGFyYW1ldGVycy5zZXRVc2VyRGlyZWN0b3J5U3VmZml4KHN1ZmZpeCk7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBTdHJpbmcgY2xpZW50SWRlbnRpZmllciA9IGNvZGVTaWduaW5n SWRlbnRpZmllcihwYXJhbWV0ZXJzLmNvbm5lY3Rpb25JZGVudGlmaWVyLnhwY0Nvbm5lY3Rpb24u Z2V0KCkpOwo=