221695 2021-02-10 10:51:31 -0800 [GPUP] <audio> won't load when URL ends with .php causing some tests to time out 2021-02-11 14:06:15 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=86308 https://bugs.webkit.org/show_bug.cgi?id=220391 InRadar P2 Normal --- 1 peng.liu6 cdumez calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1727629 0 peng.liu6 2021-02-10 10:51:31 -0800 http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect.html http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect.html http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin.html 1727855 1 cdumez 2021-02-10 15:57:03 -0800 May not be a webaudio issue. The HTMLAudioElement.play() promise is getting rejected with: NotSupportedError: The operation is not supported 1727856 2 cdumez 2021-02-10 15:59:49 -0800 It is hitting this code path in HTMLMediaElement::play(): ``` if (m_error && m_error->code() == MediaError::MEDIA_ERR_SRC_NOT_SUPPORTED) { ERROR_LOG(LOGIDENTIFIER, "rejecting promise because of error"); promise.reject(NotSupportedError, "The operation is not supported."); return; } ``` 1727864 3 cdumez 2021-02-10 16:18:02 -0800 In the GPUProcess, in MediaPlayer::loadWithNextMediaEngine(), nextBestMediaEngine(current) returns null so we end up with m_private being null and lient().mediaPlayerResourceNotSupported() getting called. m_contentType is {"containerType":"text/php","codecs":"codecs","profiles":"profiles"} 1727866 4 cdumez 2021-02-10 16:20:22 -0800 When the GPUProcess is disabled, nextBestMediaEngine() also returns null in this case. However, we end up calling nextMediaEngine() as fallback and this does return a non-null engine. So now the question is, why isn't nextMediaEngine() getting called in the GPU Process when nextBestMediaEngine() returns null. May be due to the value for m_contentMIMETypeWasInferredFromExtension being different? 1727870 5 cdumez 2021-02-10 16:29:27 -0800 (In reply to Chris Dumez from comment #4) > When the GPUProcess is disabled, nextBestMediaEngine() also returns null in > this case. However, we end up calling nextMediaEngine() as fallback and this > does return a non-null engine. > > So now the question is, why isn't nextMediaEngine() getting called in the > GPU Process when nextBestMediaEngine() returns null. May be due to the value > for m_contentMIMETypeWasInferredFromExtension being different? m_contentMIMETypeWasInferredFromExtension is indeed true in the WebProcess but false in the GPUProcess, which is why we don't end up calling nextMediaEngine(). When MediaPlayer::load() gets called in the WebProcess, m_contentType.containerType() returns an empty string so we end up setting the m_contentMIMETypeWasInferredFromExtension flag to true. In the GPUProcess though, when MediaPlayer::load() gets called, m_contentType.containerType() returns "text/php" so we don't end up setting the m_contentMIMETypeWasInferredFromExtension flag. In any case, this is clearly a media issue, not a WebAudio one. 1727872 6 cdumez 2021-02-10 16:36:44 -0800 Basically seems to have regressed Eric's fix in Bug 86308. 1727887 7 cdumez 2021-02-10 17:12:19 -0800 This makes 2 out of the 4 tests pass: diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp index 2bc8070055ca..7ecf2d09b085 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.cpp +++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp @@ -577,7 +577,7 @@ void MediaPlayer::loadWithNextMediaEngine(const MediaPlayerFactory* current) if (m_private) { #if ENABLE(MEDIA_SOURCE) if (m_mediaSource) - m_private->load(m_url, m_contentType, m_mediaSource.get()); + m_private->load(m_url, m_contentMIMETypeWasInferredFromExtension ? ContentType() : m_contentType, m_mediaSource.get()); else #endif #if ENABLE(MEDIA_STREAM) @@ -585,7 +585,7 @@ void MediaPlayer::loadWithNextMediaEngine(const MediaPlayerFactory* current) m_private->load(*m_mediaStream); else #endif - m_private->load(m_url, m_contentType, m_keySystem); + m_private->load(m_url, m_contentMIMETypeWasInferredFromExtension ? ContentType() : m_contentType, m_keySystem); } else { m_private = makeUnique<NullMediaPlayerPrivate>(this); if (!m_activeEngineIdentifier && installedMediaEngines().size() > 1 && nextBestMediaEngine(m_currentMediaEngine)) The other 2 tests (the "allowed" variants) still fail because it seems we are rendering silence. I am not sure if this means the fix is wrong or if there are 2 separate bugs. 1728198 8 420014 cdumez 2021-02-11 11:38:37 -0800 Created attachment 420014 Patch 1728203 9 420017 cdumez 2021-02-11 11:48:15 -0800 Created attachment 420017 Patch 1728205 10 420019 cdumez 2021-02-11 11:52:36 -0800 Created attachment 420019 Patch 1728245 11 420019 eric.carlson 2021-02-11 12:48:56 -0800 Comment on attachment 420019 Patch Nice detective work, thanks! r=me once the bots are happy 1728288 12 ews-feeder 2021-02-11 14:05:36 -0800 Committed r272750: <https://commits.webkit.org/r272750> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420019. 1728290 13 webkit-bug-importer 2021-02-11 14:06:15 -0800 <rdar://problem/74250095> 420014 2021-02-11 11:38:37 -0800 2021-02-11 11:48:13 -0800 Patch bug-221695-20210211113836.patch text/plain 5369 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU4ODgyZjkwZGU3YmI4 NDQ0OGJlNGU3ZWI5MDE2Zjk3ZjA0YjE0MC4uNGY3YWZmNDVjOGRjYWVkMDE3YzVhZGJmYTk1YTky Y2VjODJjZGRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBdIDxhdWRpbz4gd29u J3QgbG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocCBjYXVzaW5nIHNvbWUgdGVzdHMgdG8gdGlt ZSBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MTY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBh c3MgYW4gZW1wdHkgQ29udGVudFR5cGUgdG8gTWVkaWFQbGF5ZXJQcml2YXRlOjpsb2FkKCkgd2hl biB3ZSBkaWQgbm90IGhhdmUgYSBjb250ZW50IHR5cGUKKyAgICAgICAgYnV0IGd1ZXNzZWQgb25l IGJhc2VkIG9uIHRoZSBleHRlbnNpb24uIFRoaXMgZW5kcyB1cCBnZXR0aW5nIHBhc3NlZCB0byB0 aGUgTWVkaWFQbGF5ZXIKKyAgICAgICAgaW4gdGhlIEdQVVByb2Nlc3MgYW5kIGl0IGlzIGltcG9y dGFudCBpdCBrbm93cyBpdCBkb2VzIG5vdCBoYXZlIGEgY29udGVudCB0eXBlIHNvIHRoYXQKKyAg ICAgICAgaXQgY2FuIGd1ZXNzIG9uZSBmcm9tIHRoZSBleHRlbnNpb24gYW5kIHRyeSB0aGUgbmV4 dCBtZWRpYSBlbmdpbmUgaWYgaXQgY2Fubm90IGZpbmQgb25lLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgdW5za2lwcGVkIGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6Omxv YWRXaXRoTmV4dE1lZGlhRW5naW5lKToKKwogMjAyMS0wMi0xMCAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggZWRmY2NiMTNlOTUxODFiMzgzYmRm YzUyMTE0NTUzZWYxZTY3NzIzMi4uOWUxMTIyMTlkNWQ3N2VlNTI0MjA3YjZjY2M4NzNiOTBlY2Qw ZjI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01MDA1 LDYgKzUwMDUsMTMgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYUVuZ2luZVdhc1VwZGF0 ZWQoKQogCiAgICAgbV9tZWRpYVNlc3Npb24tPm1lZGlhRW5naW5lVXBkYXRlZCgpOwogCisjaWYg RU5BQkxFKFdFQl9BVURJTykKKyAgICBpZiAobV9hdWRpb1NvdXJjZU5vZGUpIHsKKyAgICAgICAg aWYgKGF1dG8qIHByb3ZpZGVyID0gYXVkaW9Tb3VyY2VQcm92aWRlcigpKQorICAgICAgICAgICAg cHJvdmlkZXItPnNldENsaWVudChtX2F1ZGlvU291cmNlTm9kZSk7CisgICAgfQorI2VuZGlmCisK ICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQogICAgIGlmIChtX3BsYXllciAmJiBtX21lZGlh S2V5cykKICAgICAgICAgbV9wbGF5ZXItPmNkbUluc3RhbmNlQXR0YWNoZWQobV9tZWRpYUtleXMt PmNkbUluc3RhbmNlKCkpOwpAQCAtNTA0MywxMyArNTA1MCw2IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkKICAgICBtX2Ryb3BwZWRWaWRlb0ZyYW1l cyA9IDA7CiAjZW5kaWYKIAotI2lmIEVOQUJMRShXRUJfQVVESU8pCi0gICAgaWYgKG1fYXVkaW9T b3VyY2VOb2RlKSB7Ci0gICAgICAgIGlmIChhdXRvKiBwcm92aWRlciA9IGF1ZGlvU291cmNlUHJv dmlkZXIoKSkKLSAgICAgICAgICAgIHByb3ZpZGVyLT5zZXRDbGllbnQobV9hdWRpb1NvdXJjZU5v ZGUpOwotICAgIH0KLSNlbmRpZgotCiAgICAgbV9oYXZlUHJlcGFyZWRUb1BsYXkgPSBmYWxzZTsK IAogICAgIHNjaGVkdWxlTWVkaWFFbmdpbmVXYXNVcGRhdGVkKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5kZXggMmJjODA3MDA1NWNh MTg2MzE5NDVkZDc3ZDFmYjAwODMxYjY5YThlNS4uN2VjZjJkMDliMDg1NjYxNTIyMjYxZGU0MGNl YTc3Mjk2YWVkMzhmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmNwcApAQCAtNTc3LDcgKzU3Nyw3IEBAIHZvaWQgTWVkaWFQbGF5ZXI6Omxv YWRXaXRoTmV4dE1lZGlhRW5naW5lKGNvbnN0IE1lZGlhUGxheWVyRmFjdG9yeSogY3VycmVudCkK ICAgICBpZiAobV9wcml2YXRlKSB7CiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKICAgICAgICAg aWYgKG1fbWVkaWFTb3VyY2UpCi0gICAgICAgICAgICBtX3ByaXZhdGUtPmxvYWQobV91cmwsIG1f Y29udGVudFR5cGUsIG1fbWVkaWFTb3VyY2UuZ2V0KCkpOworICAgICAgICAgICAgbV9wcml2YXRl LT5sb2FkKG1fdXJsLCBtX2NvbnRlbnRNSU1FVHlwZVdhc0luZmVycmVkRnJvbUV4dGVuc2lvbiA/ IENvbnRlbnRUeXBlKCkgOiBtX2NvbnRlbnRUeXBlLCBtX21lZGlhU291cmNlLmdldCgpKTsKICAg ICAgICAgZWxzZQogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKQEAgLTU4NSw3ICs1 ODUsNyBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZShjb25zdCBN ZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQpCiAgICAgICAgICAgICBtX3ByaXZhdGUtPmxvYWQo Km1fbWVkaWFTdHJlYW0pOwogICAgICAgICBlbHNlCiAjZW5kaWYKLSAgICAgICAgbV9wcml2YXRl LT5sb2FkKG1fdXJsLCBtX2NvbnRlbnRUeXBlLCBtX2tleVN5c3RlbSk7CisgICAgICAgIG1fcHJp dmF0ZS0+bG9hZChtX3VybCwgbV9jb250ZW50TUlNRVR5cGVXYXNJbmZlcnJlZEZyb21FeHRlbnNp b24gPyBDb250ZW50VHlwZSgpIDogbV9jb250ZW50VHlwZSwgbV9rZXlTeXN0ZW0pOwogICAgIH0g ZWxzZSB7CiAgICAgICAgIG1fcHJpdmF0ZSA9IG1ha2VVbmlxdWU8TnVsbE1lZGlhUGxheWVyUHJp dmF0ZT4odGhpcyk7CiAgICAgICAgIGlmICghbV9hY3RpdmVFbmdpbmVJZGVudGlmaWVyICYmIGlu c3RhbGxlZE1lZGlhRW5naW5lcygpLnNpemUoKSA+IDEgJiYgbmV4dEJlc3RNZWRpYUVuZ2luZSht X2N1cnJlbnRNZWRpYUVuZ2luZSkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTQyOTYxNGJhOTA1OTEyNTdlMDcxZWFiZTJh MDViZWRiNjc3NWU5Yi4uMDZhMDVmY2JkZjM1YjY4YzIzNjBhZTU1YTg2ZjhiNTU1MDk2ZDk4YyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBdIDxhdWRpbz4gd29uJ3QgbG9hZCB3aGVuIFVSTCBl bmRzIHdpdGggLnBocCBjYXVzaW5nIHNvbWUgdGVzdHMgdG8gdGltZSBvdXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tpcCB0ZXN0cyB0aGF0IGFy ZSBubyBsb25nZXIgdGltaW5nIG91dC4KKworICAgICAgICAqIGdwdS1wcm9jZXNzL1Rlc3RFeHBl Y3RhdGlvbnM6CisKIDIwMjEtMDItMTAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjMyNTUpOiBUZXh0IHN0eWxlcyB3aXRo b3V0IGFuIGV4cGxpY2l0IGxhbmd1YWdlIHRhZyBkbyBub3QgaG9ub3IgdGhlIHN5c3RlbSBsYW5n dWFnZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3MvVGVzdEV4cGVjdGF0aW9u cyBiL0xheW91dFRlc3RzL2dwdS1wcm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggY2VhYjQy ZDJhMTdmMjAwNzAwOTQ5NWMzNjQ4YTJmZGVmMjE4MzQ5YS4uYjI5YjM1MDc0YWZkOTE5NmQ4YmQ5 ZWI1YWI0ODcwMjg1NjY0Nzk1MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3Mv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9ncHUtcHJvY2Vzcy9UZXN0RXhwZWN0 YXRpb25zCkBAIC0xNzcsMTAgKzE3Nyw2IEBAIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNl Y3VyaXR5UG9saWN5L2F1ZGlvLXJlZGlyZWN0LWJsb2NrZWQuaHRtbCBbIEZhaWx1cmUKIGh0dHAv dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3ZpZGVvLXJlZGlyZWN0LWFsbG93 ZWQuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvdmlkZW8tcmVkaXJlY3QtYmxvY2tlZC5odG1sIFsgRmFpbHVyZSBdCiBodHRwL3Rlc3Rz L3NlY3VyaXR5L3ZpZGVvLWNyb3NzLW9yaWdpbi1jYWNoaW5nLmh0bWwgWyBUaW1lb3V0IF0KLWh0 dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNy b3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkv d2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2luLmh0bWwgWyBU aW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRp by1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAv dGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNy b3Nzb3JpZ2luLmh0bWwgWyBUaW1lb3V0IF0KIAogaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRp YVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUuaHRtbCBbIEZhaWx1cmUgXQog aHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLWF1ZGlvLWJpdHJhdGUuaHRtbCBb IEZhaWx1cmUgXQo= 420017 2021-02-11 11:48:15 -0800 2021-02-11 11:52:34 -0800 Patch bug-221695-20210211114814.patch text/plain 6638 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU4ODgyZjkwZGU3YmI4 NDQ0OGJlNGU3ZWI5MDE2Zjk3ZjA0YjE0MC4uNWUxNDYxZDY5ZmEwNTZhYmJlY2Q3MGExM2E3OWE0 N2E4NzY1YTViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAyLTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBdIDxhdWRpbz4gd29u J3QgbG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocCBjYXVzaW5nIHNvbWUgdGVzdHMgdG8gdGlt ZSBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MTY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cywgY292ZXJlZCBieSB1bnNraXBwZWQgbGF5b3V0IHRlc3RzLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyRW5naW5lVXBkYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckRpZEluaXRpYWxpemVNZWRpYUVuZ2luZSk6Cisg ICAgICAgIFdlIHdlcmUgY2FsbGluZyBIVE1MTWVkaWFFbGVtZW50OjphdWRpb1NvdXJjZVByb3Zp ZGVyKCkgaW4gbWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkgd2hpY2gKKyAgICAgICAgaGFwcGVu cyByaWdodCBhZnRlciB3ZSd2ZSBjb25zdHJ1Y3RlZCB0aGUgTWVkaWFQbGF5ZXJQcml2YXRlIGJ1 dCBiZWZvcmUgd2UndmUgY2FsbGVkCisgICAgICAgIGxvYWQoKSBvbiB0aGUgTWVkaWFQbGF5ZXJQ cml2YXRlLiBUaGUgaXNzdWUgd2FzIHRoYXQgY2FsbGluZyBhdWRpb1NvdXJjZVByb3ZpZGVyKCkg d291bGQKKyAgICAgICAgaW5pdGlhbGl6ZSB0aGUgQXVkaW9Tb3VyY2VQcm92aWRlciBhbmQgZW5k IHVwIHNlbmRpbmcgdGhlIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OkNyZWF0ZUF1ZGlvU291cmNl UHJvdmlkZXIKKyAgICAgICAgSVBDIHRvIHRoZSBHUFVQcm9jZXNzLiBSZW1vdGVNZWRpYVBsYXll clByb3h5OjpjcmVhdGVBdWRpb1NvdXJjZVByb3ZpZGVyKCkgd291bGQgcmV0dXJuIGVhcmx5Cisg ICAgICAgIGJlY2F1c2UgbV9wbGF5ZXItPmF1ZGlvU291cmNlUHJvdmlkZXIoKSByZXR1cm5zIG51 bGwuIFRoZSByZWFzb24gbV9wbGF5ZXItPmF1ZGlvU291cmNlUHJvdmlkZXIoKQorICAgICAgICBy ZXR1cm5zIG51bGwgaXMgYmVjYXVzZSBpdCdzIE1lZGlhUGxheWVyUHJpdmF0ZSBpcyBzdGlsbCBh IE51bGxNZWRpYVBsYXllclByaXZhdGUsIGJlY2F1c2UKKyAgICAgICAgTWVkaWFQbGF5ZXI6Omxv YWQoKSBoYXMgbm90IGJlZW4gY2FsbGVkIGluIHRoZSBHUFVQcm9jZXNzIHlldC4gRm9yIHRoaXMg cmVhc29uLCBJIG1vdmVkIHRoZQorICAgICAgICBhdWRpb1NvdXJjZVByb3ZpZGVyKCkgaW5pdGlh bGl6YXRpb24gZnJvbSBtZWRpYVBsYXllckVuZ2luZVVwZGF0ZWQoKSB0bworICAgICAgICBtZWRp YVBsYXllckRpZEluaXRpYWxpemVNZWRpYUVuZ2luZSgpLiBtZWRpYVBsYXllckRpZEluaXRpYWxp emVNZWRpYUVuZ2luZSgpIGhhcHBlbnMgcmlnaHQKKyAgICAgICAgYWZ0ZXIgd2UndmUgY2FsbGVk IE1lZGlhUGxheWVyUHJpdmF0ZTo6bG9hZCgpIHdoaWNoIHdpbGwgZW5kIHVwIGNhbGxpbmcgTWVk aWFQbGF5ZXI6OmxvYWQoKQorICAgICAgICBpbiB0aGUgR1BVUHJvY2Vzcy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZSk6CisgICAgICAgIFBhc3MgYW4gZW1w dHkgQ29udGVudFR5cGUgdG8gTWVkaWFQbGF5ZXJQcml2YXRlOjpsb2FkKCkgd2hlbiB3ZSBkaWQg bm90IGhhdmUgYSBjb250ZW50IHR5cGUKKyAgICAgICAgYnV0IGd1ZXNzZWQgb25lIGJhc2VkIG9u IHRoZSBleHRlbnNpb24uIFRoaXMgZW5kcyB1cCBnZXR0aW5nIHBhc3NlZCB0byB0aGUgTWVkaWFQ bGF5ZXIKKyAgICAgICAgaW4gdGhlIEdQVVByb2Nlc3MgYW5kIGl0IGlzIGltcG9ydGFudCBpdCBr bm93cyBpdCBkb2VzIG5vdCBoYXZlIGEgY29udGVudCB0eXBlIHNvIHRoYXQKKyAgICAgICAgaXQg Y2FuIGd1ZXNzIG9uZSBmcm9tIHRoZSBleHRlbnNpb24gYW5kIHRyeSB0aGUgbmV4dCBtZWRpYSBl bmdpbmUgaWYgaXQgY2Fubm90IGZpbmQgb25lLgorCiAyMDIxLTAyLTEwICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBlZGZjY2IxM2U5NTE4MWIz ODNiZGZjNTIxMTQ1NTNlZjFlNjc3MjMyLi4zMjA0ZWY5YWY1YzI4YjExNjk4NzI5OGM4MTYyZDJi ZWIwMzI4ZmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAg LTUwNDMsMTMgKzUwNDMsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyRW5n aW5lVXBkYXRlZCgpCiAgICAgbV9kcm9wcGVkVmlkZW9GcmFtZXMgPSAwOwogI2VuZGlmCiAKLSNp ZiBFTkFCTEUoV0VCX0FVRElPKQotICAgIGlmIChtX2F1ZGlvU291cmNlTm9kZSkgewotICAgICAg ICBpZiAoYXV0byogcHJvdmlkZXIgPSBhdWRpb1NvdXJjZVByb3ZpZGVyKCkpCi0gICAgICAgICAg ICBwcm92aWRlci0+c2V0Q2xpZW50KG1fYXVkaW9Tb3VyY2VOb2RlKTsKLSAgICB9Ci0jZW5kaWYK LQogICAgIG1faGF2ZVByZXBhcmVkVG9QbGF5ID0gZmFsc2U7CiAKICAgICBzY2hlZHVsZU1lZGlh RW5naW5lV2FzVXBkYXRlZCgpOwpAQCAtNTA2OSw4ICs1MDYyLDEyIEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6bWVkaWFQbGF5ZXJEaWRJbml0aWFsaXplTWVkaWFFbmdpbmUoKQogewogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAjaWYgRU5BQkxFKFdFQl9BVURJTykKLSAgICBpZiAobV9h dWRpb1NvdXJjZU5vZGUpCisgICAgaWYgKG1fYXVkaW9Tb3VyY2VOb2RlKSB7CisgICAgICAgIGlm IChhdXRvKiBwcm92aWRlciA9IGF1ZGlvU291cmNlUHJvdmlkZXIoKSkKKyAgICAgICAgICAgIHBy b3ZpZGVyLT5zZXRDbGllbnQobV9hdWRpb1NvdXJjZU5vZGUpOworCiAgICAgICAgIG1fYXVkaW9T b3VyY2VOb2RlLT5wcm9jZXNzTG9jaygpLnVubG9jaygpOworICAgIH0KICNlbmRpZgogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5k ZXggMmJjODA3MDA1NWNhMTg2MzE5NDVkZDc3ZDFmYjAwODMxYjY5YThlNS4uN2VjZjJkMDliMDg1 NjYxNTIyMjYxZGU0MGNlYTc3Mjk2YWVkMzhmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtNTc3LDcgKzU3Nyw3IEBAIHZvaWQg TWVkaWFQbGF5ZXI6OmxvYWRXaXRoTmV4dE1lZGlhRW5naW5lKGNvbnN0IE1lZGlhUGxheWVyRmFj dG9yeSogY3VycmVudCkKICAgICBpZiAobV9wcml2YXRlKSB7CiAjaWYgRU5BQkxFKE1FRElBX1NP VVJDRSkKICAgICAgICAgaWYgKG1fbWVkaWFTb3VyY2UpCi0gICAgICAgICAgICBtX3ByaXZhdGUt PmxvYWQobV91cmwsIG1fY29udGVudFR5cGUsIG1fbWVkaWFTb3VyY2UuZ2V0KCkpOworICAgICAg ICAgICAgbV9wcml2YXRlLT5sb2FkKG1fdXJsLCBtX2NvbnRlbnRNSU1FVHlwZVdhc0luZmVycmVk RnJvbUV4dGVuc2lvbiA/IENvbnRlbnRUeXBlKCkgOiBtX2NvbnRlbnRUeXBlLCBtX21lZGlhU291 cmNlLmdldCgpKTsKICAgICAgICAgZWxzZQogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVB TSkKQEAgLTU4NSw3ICs1ODUsNyBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRp YUVuZ2luZShjb25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQpCiAgICAgICAgICAgICBt X3ByaXZhdGUtPmxvYWQoKm1fbWVkaWFTdHJlYW0pOwogICAgICAgICBlbHNlCiAjZW5kaWYKLSAg ICAgICAgbV9wcml2YXRlLT5sb2FkKG1fdXJsLCBtX2NvbnRlbnRUeXBlLCBtX2tleVN5c3RlbSk7 CisgICAgICAgIG1fcHJpdmF0ZS0+bG9hZChtX3VybCwgbV9jb250ZW50TUlNRVR5cGVXYXNJbmZl cnJlZEZyb21FeHRlbnNpb24gPyBDb250ZW50VHlwZSgpIDogbV9jb250ZW50VHlwZSwgbV9rZXlT eXN0ZW0pOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fcHJpdmF0ZSA9IG1ha2VVbmlxdWU8TnVs bE1lZGlhUGxheWVyUHJpdmF0ZT4odGhpcyk7CiAgICAgICAgIGlmICghbV9hY3RpdmVFbmdpbmVJ ZGVudGlmaWVyICYmIGluc3RhbGxlZE1lZGlhRW5naW5lcygpLnNpemUoKSA+IDEgJiYgbmV4dEJl c3RNZWRpYUVuZ2luZShtX2N1cnJlbnRNZWRpYUVuZ2luZSkpCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTQyOTYxNGJhOTA1 OTEyNTdlMDcxZWFiZTJhMDViZWRiNjc3NWU5Yi4uMDZhMDVmY2JkZjM1YjY4YzIzNjBhZTU1YTg2 ZjhiNTU1MDk2ZDk4YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTEwICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBdIDxhdWRpbz4gd29uJ3Qg bG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocCBjYXVzaW5nIHNvbWUgdGVzdHMgdG8gdGltZSBv dXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY5 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tp cCB0ZXN0cyB0aGF0IGFyZSBubyBsb25nZXIgdGltaW5nIG91dC4KKworICAgICAgICAqIGdwdS1w cm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMTAgIE15bGVzIEMuIE1heGZpZWxk ICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjMyNTUpOiBU ZXh0IHN0eWxlcyB3aXRob3V0IGFuIGV4cGxpY2l0IGxhbmd1YWdlIHRhZyBkbyBub3QgaG9ub3Ig dGhlIHN5c3RlbSBsYW5ndWFnZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3Mv VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL2dwdS1wcm9jZXNzL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggY2VhYjQyZDJhMTdmMjAwNzAwOTQ5NWMzNjQ4YTJmZGVmMjE4MzQ5YS4uYjI5YjM1 MDc0YWZkOTE5NmQ4YmQ5ZWI1YWI0ODcwMjg1NjY0Nzk1MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZ3B1LXByb2Nlc3MvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9ncHUtcHJv Y2Vzcy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNzcsMTAgKzE3Nyw2IEBAIGh0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2F1ZGlvLXJlZGlyZWN0LWJsb2NrZWQuaHRtbCBb IEZhaWx1cmUKIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3ZpZGVv LXJlZGlyZWN0LWFsbG93ZWQuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvdmlkZW8tcmVkaXJlY3QtYmxvY2tlZC5odG1sIFsgRmFpbHVy ZSBdCiBodHRwL3Rlc3RzL3NlY3VyaXR5L3ZpZGVvLWNyb3NzLW9yaWdpbi1jYWNoaW5nLmh0bWwg WyBUaW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1h dWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAv dGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nz b3JpZ2luLmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVu ZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgWyBU aW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRp by1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2luLmh0bWwgWyBUaW1lb3V0IF0KIAogaHR0cC93cHQvbWVk aWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUuaHRt bCBbIEZhaWx1cmUgXQogaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLWF1ZGlv LWJpdHJhdGUuaHRtbCBbIEZhaWx1cmUgXQo= 420019 2021-02-11 11:52:36 -0800 2021-02-11 14:05:38 -0800 Patch bug-221695-20210211115235.patch text/plain 7231 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGMxMmNkOTRjMTYzZDc0 Yjc2ZWU1ZGRjY2MzZTIwM2IxOGRlN2I3OC4uNjJkZDk1Y2E2ZGViMDBmZWIyYTVkMDY2ZGYyMzIy YzIzYzIzM2Y3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAyLTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBdIDxhdWRpbz4gd29u J3QgbG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocCBjYXVzaW5nIHNvbWUgdGVzdHMgdG8gdGlt ZSBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MTY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cywgY292ZXJlZCBieSB1bnNraXBwZWQgbGF5b3V0IHRlc3RzLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyRW5naW5lVXBkYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckRpZEluaXRpYWxpemVNZWRpYUVuZ2luZSk6Cisg ICAgICAgIFdlIHdlcmUgY2FsbGluZyBIVE1MTWVkaWFFbGVtZW50OjphdWRpb1NvdXJjZVByb3Zp ZGVyKCkgaW4gbWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkgd2hpY2gKKyAgICAgICAgaGFwcGVu cyByaWdodCBhZnRlciB3ZSd2ZSBjb25zdHJ1Y3RlZCB0aGUgTWVkaWFQbGF5ZXJQcml2YXRlIGJ1 dCBiZWZvcmUgd2UndmUgY2FsbGVkCisgICAgICAgIGxvYWQoKSBvbiB0aGUgTWVkaWFQbGF5ZXJQ cml2YXRlLiBUaGUgaXNzdWUgd2FzIHRoYXQgY2FsbGluZyBhdWRpb1NvdXJjZVByb3ZpZGVyKCkg d291bGQKKyAgICAgICAgaW5pdGlhbGl6ZSB0aGUgQXVkaW9Tb3VyY2VQcm92aWRlciBhbmQgZW5k IHVwIHNlbmRpbmcgdGhlIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OkNyZWF0ZUF1ZGlvU291cmNl UHJvdmlkZXIKKyAgICAgICAgSVBDIHRvIHRoZSBHUFVQcm9jZXNzLiBSZW1vdGVNZWRpYVBsYXll clByb3h5OjpjcmVhdGVBdWRpb1NvdXJjZVByb3ZpZGVyKCkgd291bGQgcmV0dXJuIGVhcmx5Cisg ICAgICAgIGJlY2F1c2UgbV9wbGF5ZXItPmF1ZGlvU291cmNlUHJvdmlkZXIoKSByZXR1cm5zIG51 bGwuIFRoZSByZWFzb24gbV9wbGF5ZXItPmF1ZGlvU291cmNlUHJvdmlkZXIoKQorICAgICAgICBy ZXR1cm5zIG51bGwgaXMgYmVjYXVzZSBpdCdzIE1lZGlhUGxheWVyUHJpdmF0ZSBpcyBzdGlsbCBh IE51bGxNZWRpYVBsYXllclByaXZhdGUsIGJlY2F1c2UKKyAgICAgICAgTWVkaWFQbGF5ZXI6Omxv YWQoKSBoYXMgbm90IGJlZW4gY2FsbGVkIGluIHRoZSBHUFVQcm9jZXNzIHlldC4gRm9yIHRoaXMg cmVhc29uLCBJIG1vdmVkIHRoZQorICAgICAgICBhdWRpb1NvdXJjZVByb3ZpZGVyKCkgaW5pdGlh bGl6YXRpb24gZnJvbSBtZWRpYVBsYXllckVuZ2luZVVwZGF0ZWQoKSB0bworICAgICAgICBtZWRp YVBsYXllckRpZEluaXRpYWxpemVNZWRpYUVuZ2luZSgpLiBtZWRpYVBsYXllckRpZEluaXRpYWxp emVNZWRpYUVuZ2luZSgpIGhhcHBlbnMgcmlnaHQKKyAgICAgICAgYWZ0ZXIgd2UndmUgY2FsbGVk IE1lZGlhUGxheWVyUHJpdmF0ZTo6bG9hZCgpIHdoaWNoIHdpbGwgZW5kIHVwIGNhbGxpbmcgTWVk aWFQbGF5ZXI6OmxvYWQoKQorICAgICAgICBpbiB0aGUgR1BVUHJvY2Vzcy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZSk6CisgICAgICAgIFBhc3MgYW4gZW1w dHkgQ29udGVudFR5cGUgdG8gTWVkaWFQbGF5ZXJQcml2YXRlOjpsb2FkKCkgd2hlbiB3ZSBkaWQg bm90IGhhdmUgYSBjb250ZW50IHR5cGUKKyAgICAgICAgYnV0IGd1ZXNzZWQgb25lIGJhc2VkIG9u IHRoZSBleHRlbnNpb24uIFRoaXMgZW5kcyB1cCBnZXR0aW5nIHBhc3NlZCB0byB0aGUgTWVkaWFQ bGF5ZXIKKyAgICAgICAgaW4gdGhlIEdQVVByb2Nlc3MgYW5kIGl0IGlzIGltcG9ydGFudCBpdCBr bm93cyBpdCBkb2VzIG5vdCBoYXZlIGEgY29udGVudCB0eXBlIHNvIHRoYXQKKyAgICAgICAgaXQg Y2FuIGd1ZXNzIG9uZSBmcm9tIHRoZSBleHRlbnNpb24gYW5kIHRyeSB0aGUgbmV4dCBtZWRpYSBl bmdpbmUgaWYgaXQgY2Fubm90IGZpbmQgb25lLgorCiAyMDIxLTAyLTExICBBZGl0eWEgS2VlcnRo aSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtGQ1JdIFJhbmdlIGlucHV0 cyBoYXZlIGFuIGluY29ycmVjdCBSVEwgYXBwZWFyYW5jZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKaW5kZXggYjdjZjEyZjQzZjgyZjgzMzI4N2Y4NzQ2YjI2MjhhYjJi NWRlYmQwZi4uOTQ5MjNmNGQ4OWNiMmYwYTg0ZGY0ZTZjZTM0NTljMzY1NmQyNTA2MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01MDQ0LDEzICs1MDQ0LDYg QEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckVuZ2luZVVwZGF0ZWQoKQogICAg IG1fZHJvcHBlZFZpZGVvRnJhbWVzID0gMDsKICNlbmRpZgogCi0jaWYgRU5BQkxFKFdFQl9BVURJ TykKLSAgICBpZiAobV9hdWRpb1NvdXJjZU5vZGUpIHsKLSAgICAgICAgaWYgKGF1dG8qIHByb3Zp ZGVyID0gYXVkaW9Tb3VyY2VQcm92aWRlcigpKQotICAgICAgICAgICAgcHJvdmlkZXItPnNldENs aWVudChtX2F1ZGlvU291cmNlTm9kZSk7Ci0gICAgfQotI2VuZGlmCi0KICAgICBtX2hhdmVQcmVw YXJlZFRvUGxheSA9IGZhbHNlOwogCiAgICAgc2NoZWR1bGVNZWRpYUVuZ2luZVdhc1VwZGF0ZWQo KTsKQEAgLTUwNzAsOCArNTA2MywxMiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxh eWVyRGlkSW5pdGlhbGl6ZU1lZGlhRW5naW5lKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwogI2lmIEVOQUJMRShXRUJfQVVESU8pCi0gICAgaWYgKG1fYXVkaW9Tb3VyY2VOb2RlKQor ICAgIGlmIChtX2F1ZGlvU291cmNlTm9kZSkgeworICAgICAgICBpZiAoYXV0byogcHJvdmlkZXIg PSBhdWRpb1NvdXJjZVByb3ZpZGVyKCkpCisgICAgICAgICAgICBwcm92aWRlci0+c2V0Q2xpZW50 KG1fYXVkaW9Tb3VyY2VOb2RlKTsKKwogICAgICAgICBtX2F1ZGlvU291cmNlTm9kZS0+cHJvY2Vz c0xvY2soKS51bmxvY2soKTsKKyAgICB9CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IDJiYzgwNzAwNTVjYTE4 NjMxOTQ1ZGQ3N2QxZmIwMDgzMWI2OWE4ZTUuLjdlY2YyZDA5YjA4NTY2MTUyMjI2MWRlNDBjZWE3 NzI5NmFlZDM4ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5jcHAKQEAgLTU3Nyw3ICs1NzcsNyBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2Fk V2l0aE5leHRNZWRpYUVuZ2luZShjb25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQpCiAg ICAgaWYgKG1fcHJpdmF0ZSkgewogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCiAgICAgICAgIGlm IChtX21lZGlhU291cmNlKQotICAgICAgICAgICAgbV9wcml2YXRlLT5sb2FkKG1fdXJsLCBtX2Nv bnRlbnRUeXBlLCBtX21lZGlhU291cmNlLmdldCgpKTsKKyAgICAgICAgICAgIG1fcHJpdmF0ZS0+ bG9hZChtX3VybCwgbV9jb250ZW50TUlNRVR5cGVXYXNJbmZlcnJlZEZyb21FeHRlbnNpb24gPyBD b250ZW50VHlwZSgpIDogbV9jb250ZW50VHlwZSwgbV9tZWRpYVNvdXJjZS5nZXQoKSk7CiAgICAg ICAgIGVsc2UKICNlbmRpZgogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCkBAIC01ODUsNyArNTg1 LDcgQEAgdm9pZCBNZWRpYVBsYXllcjo6bG9hZFdpdGhOZXh0TWVkaWFFbmdpbmUoY29uc3QgTWVk aWFQbGF5ZXJGYWN0b3J5KiBjdXJyZW50KQogICAgICAgICAgICAgbV9wcml2YXRlLT5sb2FkKCpt X21lZGlhU3RyZWFtKTsKICAgICAgICAgZWxzZQogI2VuZGlmCi0gICAgICAgIG1fcHJpdmF0ZS0+ bG9hZChtX3VybCwgbV9jb250ZW50VHlwZSwgbV9rZXlTeXN0ZW0pOworICAgICAgICBtX3ByaXZh dGUtPmxvYWQobV91cmwsIG1fY29udGVudE1JTUVUeXBlV2FzSW5mZXJyZWRGcm9tRXh0ZW5zaW9u ID8gQ29udGVudFR5cGUoKSA6IG1fY29udGVudFR5cGUsIG1fa2V5U3lzdGVtKTsKICAgICB9IGVs c2UgewogICAgICAgICBtX3ByaXZhdGUgPSBtYWtlVW5pcXVlPE51bGxNZWRpYVBsYXllclByaXZh dGU+KHRoaXMpOwogICAgICAgICBpZiAoIW1fYWN0aXZlRW5naW5lSWRlbnRpZmllciAmJiBpbnN0 YWxsZWRNZWRpYUVuZ2luZXMoKS5zaXplKCkgPiAxICYmIG5leHRCZXN0TWVkaWFFbmdpbmUobV9j dXJyZW50TWVkaWFFbmdpbmUpKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDc4N2E5MjY5YTkwYjE0Mjg3ZGE0YzcwZjEwM2Y4 NDgwYmVhZDA2YjMuLjgwNGU4MzA3YzdhMDNhYWFlOWJjMWVkNWJkNTliNmJmYzViZGQ2YTAgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCisgICAgICAgIFtHUFVQXSA8YXVkaW8+IHdvbid0IGxvYWQgd2hlbiBVUkwgZW5k cyB3aXRoIC5waHAgY2F1c2luZyBzb21lIHRlc3RzIHRvIHRpbWUgb3V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2OTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgdGVzdHMgdGhhdCBhcmUg bm8gbG9uZ2VyIHRpbWluZyBvdXQuCisKKyAgICAgICAgKiBncHUtcHJvY2Vzcy9UZXN0RXhwZWN0 YXRpb25zOgorCiAyMDIxLTAyLTExICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXVtGQ1JdIFJhbmdlIGlucHV0cyBoYXZlIGFuIGluY29ycmVjdCBS VEwgYXBwZWFyYW5jZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3MvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL2dwdS1wcm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k ZXggZjI1NjhmNWUxNzNhZjA5OWFiNTQ5YTVmNGEzNzQ2ZTg5ZWJiZDAwZi4uMTJjYTFjZTZhYTE5 MTNlZTIxZTZlNjRiNzQwYzNmOTY3NjM2OGRhOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZ3B1 LXByb2Nlc3MvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9ncHUtcHJvY2Vzcy9U ZXN0RXhwZWN0YXRpb25zCkBAIC0zNzcsMTIgKzM3Nyw2IEBAIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvd2ViYXVkaW8vdGhlLWF1ZGlvLWFwaS90aGUtY29udm9sdmVybm9kZS1pbnRl cmZhCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYmF1ZGlvL3RoZS1hdWRpby1h cGkvdGhlLWRlc3RpbmF0aW9ubm9kZS1pbnRlcmZhY2UvZGVzdGluYXRpb24uaHRtbCBbIEZhaWx1 cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJhdWRpby90aGUtYXVkaW8t YXBpL3RoZS1tZWRpYWVsZW1lbnRhdWRpb3NvdXJjZW5vZGUtaW50ZXJmYWNlL25vLWNvcnMuaHR0 cHMuaHRtbCBbIEZhaWx1cmUgXQogCi0jIHdlYmtpdC5vcmcvYi8yMjE2OTUKLWh0dHAvdGVzdHMv c2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2lu LXJlZGlyZWN0Lmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8t cmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2luLmh0bWwgWyBUaW1lb3V0IF0K LWh0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2Vk LW5vLWNyb3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgWyBUaW1lb3V0IF0KLWh0dHAvdGVzdHMvc2Vj dXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2lu Lmh0bWwgWyBUaW1lb3V0IF0KLQogd2ViZ2wvMS4wLjMvY29uZm9ybWFuY2UvY2FudmFzL2NhbnZh cy10ZXN0Lmh0bWwgWyBGYWlsdXJlIF0KIHdlYmdsLzEuMC4zL2NvbmZvcm1hbmNlL2NhbnZhcy9k cmF3LXN0YXRpYy13ZWJnbC10by1tdWx0aXBsZS1jYW52YXMtdGVzdC5odG1sIFsgRmFpbHVyZSBd CiB3ZWJnbC8xLjAuMy9jb25mb3JtYW5jZS9jYW52YXMvZHJhdy13ZWJnbC10by1jYW52YXMtdGVz dC5odG1sIFsgRmFpbHVyZSBdCkBAIC03OTUsNCArNzg5LDQgQEAgd2VicnRjL3ZpZGVvLXJvdGF0 aW9uLmh0bWwgWyBUaW1lb3V0IF0KIHdlYnJ0Yy92aWRlby11bm11dGUuaHRtbCBbIFRpbWVvdXQg XQogcGxhdGZvcm0vbWFjL3dlYnJ0Yy9jYXB0dXJlQ2FudmFzLXdlYnJ0Yy1zb2Z0d2FyZS1lbmNv ZGVyLmh0bWwgWyBUaW1lb3V0IF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vi cnRjL2xlZ2FjeS9SVENQZWVyQ29ubmVjdGlvbi1jcmVhdGVPZmZlci1vZmZlclRvUmVjZWl2ZS5o dG1sIFsgQ3Jhc2ggXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRD UnRwU2VuZGVyLXJlcGxhY2VUcmFjay5odHRwcy5odG1sIFsgVGltZW91dCBdClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQoraW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMv UlRDUnRwU2VuZGVyLXJlcGxhY2VUcmFjay5odHRwcy5odG1sIFsgVGltZW91dCBdCg==