220960 2021-01-25 17:18:41 -0800 Mute audio capture for speech recognition based on shouldInterruptAudioOnPageVisibilityChange when page is invisible 2021-01-26 22:32:12 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu stephan.szabo webkit-bug-importer youennf oldest_to_newest 1722355 0 sihui_liu 2021-01-25 17:18:41 -0800 ... 1722358 1 418360 sihui_liu 2021-01-25 17:30:12 -0800 Created attachment 418360 Patch 1722359 2 418361 sihui_liu 2021-01-25 17:31:18 -0800 Created attachment 418361 Patch 1722376 3 418361 stephan.szabo 2021-01-25 18:58:12 -0800 Comment on attachment 418361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418361&action=review > Source/WebKit/UIProcess/WebProcessProxy.cpp:1793 > + if (!RealtimeMediaSourceCenter::shouldInterruptAudioOnPageVisibilityChange()) This seems like it may need to be in at least a #if ENABLE(MEDIA_STREAM) since RealtimeMediaSourceCenter.h uses one around the whole body. 1722414 4 418376 sihui_liu 2021-01-26 00:18:28 -0800 Created attachment 418376 Patch 1722415 5 418376 youennf 2021-01-26 00:35:14 -0800 Comment on attachment 418376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418376&action=review > Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp:166 > + m_suspended = true; Do we really need that change? It moves away from being able to apply user gesture constraint to this API, which seems desirable given this asks for microphone and can prompt the user. 1722556 6 418432 sihui_liu 2021-01-26 09:45:36 -0800 Created attachment 418432 Patch 1722747 7 418479 sihui_liu 2021-01-26 15:24:42 -0800 Created attachment 418479 Patch 1722821 8 418502 sihui_liu 2021-01-26 20:54:18 -0800 Created attachment 418502 Patch 1722838 9 ews-feeder 2021-01-26 22:31:11 -0800 Committed r271935: <https://trac.webkit.org/changeset/271935> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418502. 1722839 10 webkit-bug-importer 2021-01-26 22:32:12 -0800 <rdar://problem/73648946> 418360 2021-01-25 17:30:12 -0800 2021-01-25 17:31:17 -0800 Patch bug-220960-20210125173011.patch text/plain 8411 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEyNWMyMDU3NjUyNzg4 Nzg5YmQ1M2JlMDQ4MDVlZmFhYjZlNDQyYi4uZWYyNWIzZWUwYzE5MzcwYWU2NDZhMGYxZWU0ZjA5 ZjhlYmJiMWM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAxLTI1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgTXV0ZSBhdWRpbyBjYXB0dXJl IGZvciBzcGVlY2ggcmVjb2duaXRpb24gYmFzZWQgb24gc2hvdWxkSW50ZXJydXB0QXVkaW9PblBh Z2VWaXNpYmlsaXR5Q2hhbmdlIHdoZW4gcGFnZSBpcyBpbnZpc2libGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk2MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hdGNoIG1lZGlhIGNhcHR1cmUncyBi ZWhhdmlvci4KKworICAgICAgICAqIE1vZHVsZXMvc3BlZWNoL2NvY29hL1dlYlNwZWVjaFJlY29n bml6ZXJUYXNrLm1tOgorICAgICAgICAoLVtXZWJTcGVlY2hSZWNvZ25pemVyVGFza0ltcGwgaW5p dFdpdGhJZGVudGlmaWVyOmxvY2FsZTpkb011bHRpcGxlUmVjb2duaXRpb25zOnJlcG9ydEludGVy aW1SZXN1bHRzOm1heEFsdGVybmF0aXZlczpkZWxlZ2F0ZUNhbGxiYWNrOl0pOgorCiAyMDIxLTAx LTI1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBY3RpdmF0 ZSBzaW11bGNhc3QgdGhyb3VnaCBhZGRUcmFuc2NlaXZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkYjA1MjQzYTJk ZGQxMjIxZWZjMjE0YzIwMDljODFkMmQxY2Y3ZjI0Li41MDA1MzY5NjA5ZDk0MGI5YzExZDNmNzAy N2VjOGFlYTNjMjE3MjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTI1ICBT aWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgTXV0ZSBhdWRpbyBjYXB0 dXJlIGZvciBzcGVlY2ggcmVjb2duaXRpb24gYmFzZWQgb24gc2hvdWxkSW50ZXJydXB0QXVkaW9P blBhZ2VWaXNpYmlsaXR5Q2hhbmdlIHdoZW4gcGFnZSBpcyBpbnZpc2libGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1NwZWVjaFJl Y29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTcGVlY2hS ZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyOjpjb250aW51ZVByb2Nlc3NpbmdSZXF1ZXN0KToK KyAgICAgICAgKFdlYktpdDo6U3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlcjo6cmVz dW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFu YWdlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlNwZWVjaFJlY29nbml0aW9uU2VydmVyOjphYm9ydEZvclBhZ2VJ c0JlY29taW5nSW52aXNpYmxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvU3BlZWNo UmVjb2duaXRpb25TZXJ2ZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3SXNCZWNvbWluZ1Zpc2libGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUHJveHk6OnBhZ2VJc0JlY29taW5nSW52aXNpYmxlKToKKwogMjAyMS0w MS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TIFdLMl0gdGhldmVyZ2UuY29tIC0gcnViYmVyIGJhbmQgc2Nyb2xsaW5nIGF0IHRoZSB0b3Ag b2YgdGhlIHBhZ2UgY2F1c2VzIGFuIGFicnVwdCBqdW1wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3NwZWVjaC9jb2NvYS9XZWJTcGVlY2hSZWNvZ25pemVyVGFzay5tbSBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvc3BlZWNoL2NvY29hL1dlYlNwZWVjaFJlY29nbml6ZXJUYXNr Lm1tCmluZGV4IDUwMjUwNzc3YmI1MDRiZTIxZTJkOTMxMTBmYjM5MWMxMzNiMDg0NjMuLjBmYTJm YWUyNWE0MTg2ZmVkMDY1MDgyMjllNGI1NjkxYzBhOWU0NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvc3BlZWNoL2NvY29hL1dlYlNwZWVjaFJlY29nbml6ZXJUYXNrLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3BlZWNoL2NvY29hL1dlYlNwZWVjaFJlY29nbml6 ZXJUYXNrLm1tCkBAIC0xMDUsNyArMTA1LDcgQEAgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KICAg ICBbX3JlcXVlc3Qgc2V0VGFza0hpbnQ6U0ZTcGVlY2hSZWNvZ25pdGlvblRhc2tIaW50RGljdGF0 aW9uXTsKIAogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCi0gICAgW19yZXF1ZXN0IHNldERl dGVjdE11bHRpcGxlVXR0ZXJhbmNlczpZRVNdOworICAgIFtfcmVxdWVzdCBzZXREZXRlY3RNdWx0 aXBsZVV0dGVyYW5jZXM6Tk9dOwogICAgIFtfcmVxdWVzdCBfc2V0TWF4aW11bVJlY29nbml0aW9u RHVyYXRpb246bWF4aW11bVJlY29nbml0aW9uRHVyYXRpb25dOwogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJt aXNzaW9uTWFuYWdlci5jcHAKaW5kZXggYTgwOGJmNmM2NGU4NWYzNDVmZWU4ZTU5YmVmZjkxNmVi NzkwMWJhYi4uZGVhZDYzOTdkMTc2ZjE5NjMzYzAyMDM2OWUxM2MyMzU1MThmMjg3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9u TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRp b25QZXJtaXNzaW9uTWFuYWdlci5jcHAKQEAgLTE2Myw3ICsxNjMsNyBAQCB2b2lkIFNwZWVjaFJl Y29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXI6OmNvbnRpbnVlUHJvY2Vzc2luZ1JlcXVlc3QoKQog ICAgIEFTU0VSVChtX3VzZXJQZXJtaXNzaW9uQ2hlY2sgPT0gQ2hlY2tSZXN1bHQ6OkdyYW50ZWQp OwogCiAgICAgaWYgKCFtX3BhZ2UuaXNWaWV3VmlzaWJsZSgpKSB7Ci0gICAgICAgIGNvbXBsZXRl Q3VycmVudFJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvciB7IFdlYkNvcmU6 OlNwZWVjaFJlY29nbml0aW9uRXJyb3JUeXBlOjpOb3RBbGxvd2VkLCAiUGFnZSBpcyBub3Qgdmlz aWJsZSB0byB1c2VyIiB9KTsKKyAgICAgICAgbV9zdXNwZW5kZWQgPSB0cnVlOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCkBAIC0yNTEsNSArMjUxLDE0IEBAIHZvaWQgU3BlZWNoUmVjb2duaXRp b25QZXJtaXNzaW9uTWFuYWdlcjo6ZGVjaWRlQnlEZWZhdWx0QWN0aW9uKGNvbnN0IFdlYkNvcmU6 OlNlCiAjZW5kaWYKIH0KIAordm9pZCBTcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2Vy OjpyZXN1bWUoKQoreworICAgIGlmICghbV9zdXNwZW5kZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fc3VzcGVuZGVkID0gZmFsc2U7CisgICAgY29tcGxldGVDdXJyZW50UmVxdWVzdCgpOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5oCmluZGV4 IDI0MjU3NTk1YTI5ZjljNzA5MDBjZGU1NjkxODk0Yjk2Yjc1MzMzYzguLjU1ODk0NTA2NTBjOTg5 NzdmZDc2MjZiMGZlOWMyNGU5ZWVkYTkxNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyLmgKQEAg LTQ0LDYgKzQ0LDggQEAgcHVibGljOgogICAgIHZvaWQgZGVjaWRlQnlEZWZhdWx0QWN0aW9uKGNv bnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29s KT4mJik7CiAgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdlOyB9CiAKKyAg ICB2b2lkIHJlc3VtZSgpOworCiBwcml2YXRlOgogICAgIHZvaWQgc3RhcnROZXh0UmVxdWVzdCgp OwogICAgIHZvaWQgc3RhcnRQcm9jZXNzaW5nUmVxdWVzdCgpOwpAQCAtNTgsNiArNjAsOCBAQCBw cml2YXRlOgogICAgIENoZWNrUmVzdWx0IG1fbWljcm9waG9uZUNoZWNrIHsgQ2hlY2tSZXN1bHQ6 OlVua25vd24gfTsKICAgICBDaGVja1Jlc3VsdCBtX3NwZWVjaFJlY29nbml0aW9uU2VydmljZUNo ZWNrIHsgQ2hlY2tSZXN1bHQ6OlVua25vd24gfTsKICAgICBDaGVja1Jlc3VsdCBtX3VzZXJQZXJt aXNzaW9uQ2hlY2sgeyBDaGVja1Jlc3VsdDo6VW5rbm93biB9OworCisgICAgYm9vbCBtX3N1c3Bl bmRlZCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmNwcAppbmRleCA5 NWY0ZGYyMGRkYjFlMjc5NmI0Yjk2YWNhYmFhNzY0ZmM4ZGY4NjNiLi5mNjMxZTNjODY4NDAzZjkw NmE3OGNhZWM2OTkwMDk4NDY0N2I4OWVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwCkBAIC0xNjcsMjAgKzE2Nyw2IEBAIHZv aWQgU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmludmFsaWRhdGUoV2ViQ29yZTo6U3BlZWNoUmVj b2duaXRpb25Db25uZWN0aW9uQ2xpCiAgICAgfQogfQogCi12b2lkIFNwZWVjaFJlY29nbml0aW9u U2VydmVyOjphYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCkKLXsKLSAgICBpZiAoIW1f cmVjb2duaXplcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byBjdXJyZW50Q2xpZW50SWRl bnRpZmllciA9IG1fcmVjb2duaXplci0+Y3VycmVudENsaWVudElkZW50aWZpZXIoKTsKLSAgICBp ZiAoIWN1cnJlbnRDbGllbnRJZGVudGlmaWVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRv IGVycm9yID0gV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvciB7IFdlYkNvcmU6OlNwZWVj aFJlY29nbml0aW9uRXJyb3JUeXBlOjpBYm9ydGVkLCAiUGFnZSBpcyBubyBsb25nZXIgdmlzaWJs ZSJfcyB9OwotICAgIHNlbmRVcGRhdGUoKmN1cnJlbnRDbGllbnRJZGVudGlmaWVyLCBXZWJDb3Jl OjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGU6OkVycm9yLCBlcnJvcik7Ci0gICAgbV9yZWNv Z25pemVyLT5yZXNldCgpOwotfQotCiB2b2lkIFNwZWVjaFJlY29nbml0aW9uU2VydmVyOjpzZW5k VXBkYXRlKFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uQ29ubmVjdGlvbkNsaWVudElkZW50aWZp ZXIgY2xpZW50SWRlbnRpZmllciwgV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25VcGRhdGVUeXBl IHR5cGUsIE9wdGlvbmFsPFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3I+IGVycm9yLCBP cHRpb25hbDxWZWN0b3I8V2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25SZXN1bHREYXRhPj4gcmVz dWx0KQogewogICAgIGF1dG8gdXBkYXRlID0gV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25VcGRh dGU6OmNyZWF0ZShjbGllbnRJZGVudGlmaWVyLCB0eXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCmluZGV4IGMzN2Y4OTJmNTc0YWU0 ZmRkZDhlNjQ2NGRlMmQyOGRhOWQ3ZDNlNjAuLmVjYmE0MDcwOTQwMzhiMzk3NjU1ZWNiMDE4ZGMy MTdkYmFhMWFiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJl Y29nbml0aW9uU2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVj b2duaXRpb25TZXJ2ZXIuaApAQCAtNjMsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBhYm9y dChXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGllbnRJZGVudGlmaWVyKTsK ICAgICB2b2lkIGludmFsaWRhdGUoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25Db25uZWN0aW9u Q2xpZW50SWRlbnRpZmllcik7CiAgICAgdm9pZCBtdXRlKCk7Ci0gICAgdm9pZCBhYm9ydEZvclBh Z2VJc0JlY29taW5nSW52aXNpYmxlKCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCByZXF1ZXN0UGVy bWlzc2lvbkZvclJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25SZXF1ZXN0Jik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA0MmRlYmJhZmE0Njk3 ZjA4ZTVkZWEwZGUwMWU4Nzc2NjJiNWZkODlmLi44MzNiN2NhNDkzZGZjMDg1M2Y5ZmRhNjE4Nzc3 ZmQ5ODhlY2RlNzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTQ5MjgsNiArNDkyOCw5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3SXNCZWNvbWluZ1Zp c2libGUoKQogICAgIGlmIChtX3VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcikKICAg ICAgICAgbV91c2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXItPnZpZXdJc0JlY29taW5n VmlzaWJsZSgpOwogI2VuZGlmCisKKyAgICBpZiAobV9zcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Np b25NYW5hZ2VyKQorICAgICAgICBtX3NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIt PnJlc3VtZSgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJh bWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwCmluZGV4IDlhZWU1ZjdjMTMwODBlMGJjNmFlOTM4YzMwMGFkODQ1OGVlY2YzNzkuLmFj OWMyNzZiNDUzYWNiOGFhOTZiNjVmNjcyY2RhMDVmMTEzMTAyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTc5MCw4ICsxNzkwLDExIEBAIHZv aWQgV2ViUHJvY2Vzc1Byb3h5OjpwYWdlTXV0ZWRTdGF0ZUNoYW5nZWQoV2ViQ29yZTo6UGFnZUlk ZW50aWZpZXIgaWRlbnRpZmllciwKIAogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnBhZ2VJc0JlY29t aW5nSW52aXNpYmxlKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIGlkZW50aWZpZXIpCiB7Ci0gICAg aWYgKGF1dG8gc2VydmVyID0gbV9zcGVlY2hSZWNvZ25pdGlvblNlcnZlck1hcC5nZXQoaWRlbnRp ZmllcikpCi0gICAgICAgIHNlcnZlci0+YWJvcnRGb3JQYWdlSXNCZWNvbWluZ0ludmlzaWJsZSgp OworICAgIGlmICghUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6c2hvdWxkSW50ZXJydXB0QXVk aW9PblBhZ2VWaXNpYmlsaXR5Q2hhbmdlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChh dXRvIHNwZWVjaFJlY29nbml0aW9uU2VydmVyID0gbV9zcGVlY2hSZWNvZ25pdGlvblNlcnZlck1h cC5nZXQoaWRlbnRpZmllcikpCisgICAgICAgIHNwZWVjaFJlY29nbml0aW9uU2VydmVyLT5tdXRl KCk7CiB9CiAKICNpZiBQTEFURk9STShXQVRDSE9TKQo= 418361 2021-01-25 17:31:18 -0800 2021-01-26 00:18:26 -0800 Patch bug-220960-20210125173117.patch text/plain 7813 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiMDUyNDNhMmRkZDEyMjFl ZmMyMTRjMjAwOWM4MWQyZDFjZjdmMjQuLjE2ZTUzOTM5ZGE3NTY5NmM2NWM1MWQ1MTRjNDY0NTVh YWQ0YzBkNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjEtMDEtMjUgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBNdXRlIGF1ZGlvIGNhcHR1cmUgZm9y IHNwZWVjaCByZWNvZ25pdGlvbiBiYXNlZCBvbiBzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZp c2liaWxpdHlDaGFuZ2Ugd2hlbiBwYWdlIGlzIGludmlzaWJsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWF0Y2ggbWVkaWEgY2FwdHVyZSdzIGJlaGF2 aW9yLgorCisgICAgICAgICogVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1h bmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25N YW5hZ2VyOjpjb250aW51ZVByb2Nlc3NpbmdSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6U3Bl ZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlcjo6cmVzdW1lKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNw ZWVjaFJlY29nbml0aW9uU2VydmVyOjphYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKTog RGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5Ojp2aWV3SXNCZWNvbWluZ1Zpc2libGUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6 OnBhZ2VJc0JlY29taW5nSW52aXNpYmxlKToKKworMjAyMS0wMS0yNSAgU2lodWkgTGl1ICA8c2lo dWlfbGl1QGFwcGUuY29tPgorCisgICAgICAgIE11dGUgYXVkaW8gY2FwdHVyZSBmb3Igc3BlZWNo IHJlY29nbml0aW9uIGJhc2VkIG9uIHNob3VsZEludGVycnVwdEF1ZGlvT25QYWdlVmlzaWJpbGl0 eUNoYW5nZSB3aGVuIHBhZ2UgaXMgaW52aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBlcm1p c3Npb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3BlZWNoUmVjb2duaXRpb25QZXJt aXNzaW9uTWFuYWdlcjo6Y29udGludWVQcm9jZXNzaW5nUmVxdWVzdCk6CisgICAgICAgIChXZWJL aXQ6OlNwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXI6OnJlc3VtZSk6CisgICAgICAg ICogVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTcGVlY2hSZWNvZ25pdGlvblNlcnZlcjo6YWJvcnRGb3JQYWdlSXNCZWNvbWluZ0ludmlz aWJsZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2Vy dmVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld0lzQmVjb21pbmdWaXNpYmxlKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c1Byb3h5OjpwYWdlSXNCZWNvbWluZ0ludmlzaWJsZSk6CisKIDIwMjEtMDEtMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIHRoZXZl cmdlLmNvbSAtIHJ1YmJlciBiYW5kIHNjcm9sbGluZyBhdCB0aGUgdG9wIG9mIHRoZSBwYWdlIGNh dXNlcyBhbiBhYnJ1cHQganVtcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyLmNwcAppbmRleCBhODA4 YmY2YzY0ZTg1ZjM0NWZlZThlNTliZWZmOTE2ZWI3OTAxYmFiLi5kZWFkNjM5N2QxNzZmMTk2MzNj MDIwMzY5ZTEzYzIzNTUxOGYyODcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9TcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyLmNwcApAQCAt MTYzLDcgKzE2Myw3IEBAIHZvaWQgU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlcjo6 Y29udGludWVQcm9jZXNzaW5nUmVxdWVzdCgpCiAgICAgQVNTRVJUKG1fdXNlclBlcm1pc3Npb25D aGVjayA9PSBDaGVja1Jlc3VsdDo6R3JhbnRlZCk7CiAKICAgICBpZiAoIW1fcGFnZS5pc1ZpZXdW aXNpYmxlKCkpIHsKLSAgICAgICAgY29tcGxldGVDdXJyZW50UmVxdWVzdChXZWJDb3JlOjpTcGVl Y2hSZWNvZ25pdGlvbkVycm9yIHsgV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvclR5cGU6 Ok5vdEFsbG93ZWQsICJQYWdlIGlzIG5vdCB2aXNpYmxlIHRvIHVzZXIiIH0pOworICAgICAgICBt X3N1c3BlbmRlZCA9IHRydWU7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI1MSw1ICsy NTEsMTQgQEAgdm9pZCBTcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyOjpkZWNpZGVC eURlZmF1bHRBY3Rpb24oY29uc3QgV2ViQ29yZTo6U2UKICNlbmRpZgogfQogCit2b2lkIFNwZWVj aFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXI6OnJlc3VtZSgpCit7CisgICAgaWYgKCFtX3N1 c3BlbmRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zdXNwZW5kZWQgPSBmYWxzZTsKKyAg ICBjb21wbGV0ZUN1cnJlbnRSZXF1ZXN0KCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBl cm1pc3Npb25NYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25p dGlvblBlcm1pc3Npb25NYW5hZ2VyLmgKaW5kZXggMjQyNTc1OTVhMjlmOWM3MDkwMGNkZTU2OTE4 OTRiOTZiNzUzMzNjOC4uNTU4OTQ1MDY1MGM5ODk3N2ZkNzYyNmIwZmU5YzI0ZTllZWRhOTE2ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJt aXNzaW9uTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29n bml0aW9uUGVybWlzc2lvbk1hbmFnZXIuaApAQCAtNDQsNiArNDQsOCBAQCBwdWJsaWM6CiAgICAg dm9pZCBkZWNpZGVCeURlZmF1bHRBY3Rpb24oY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4m LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAgICBXZWJQYWdlUHJveHkmIHBh Z2UoKSB7IHJldHVybiBtX3BhZ2U7IH0KIAorICAgIHZvaWQgcmVzdW1lKCk7CisKIHByaXZhdGU6 CiAgICAgdm9pZCBzdGFydE5leHRSZXF1ZXN0KCk7CiAgICAgdm9pZCBzdGFydFByb2Nlc3NpbmdS ZXF1ZXN0KCk7CkBAIC01OCw2ICs2MCw4IEBAIHByaXZhdGU6CiAgICAgQ2hlY2tSZXN1bHQgbV9t aWNyb3Bob25lQ2hlY2sgeyBDaGVja1Jlc3VsdDo6VW5rbm93biB9OwogICAgIENoZWNrUmVzdWx0 IG1fc3BlZWNoUmVjb2duaXRpb25TZXJ2aWNlQ2hlY2sgeyBDaGVja1Jlc3VsdDo6VW5rbm93biB9 OwogICAgIENoZWNrUmVzdWx0IG1fdXNlclBlcm1pc3Npb25DaGVjayB7IENoZWNrUmVzdWx0OjpV bmtub3duIH07CisKKyAgICBib29sIG1fc3VzcGVuZGVkIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3Bl ZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNo UmVjb2duaXRpb25TZXJ2ZXIuY3BwCmluZGV4IDk1ZjRkZjIwZGRiMWUyNzk2YjRiOTZhY2FiYWE3 NjRmYzhkZjg2M2IuLmY2MzFlM2M4Njg0MDNmOTA2YTc4Y2FlYzY5OTAwOTg0NjQ3Yjg5ZWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZl ci5jcHAKQEAgLTE2NywyMCArMTY3LDYgQEAgdm9pZCBTcGVlY2hSZWNvZ25pdGlvblNlcnZlcjo6 aW52YWxpZGF0ZShXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGkKICAgICB9 CiB9CiAKLXZvaWQgU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmFib3J0Rm9yUGFnZUlzQmVjb21p bmdJbnZpc2libGUoKQotewotICAgIGlmICghbV9yZWNvZ25pemVyKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBhdXRvIGN1cnJlbnRDbGllbnRJZGVudGlmaWVyID0gbV9yZWNvZ25pemVyLT5jdXJy ZW50Q2xpZW50SWRlbnRpZmllcigpOwotICAgIGlmICghY3VycmVudENsaWVudElkZW50aWZpZXIp Ci0gICAgICAgIHJldHVybjsKLQotICAgIGF1dG8gZXJyb3IgPSBXZWJDb3JlOjpTcGVlY2hSZWNv Z25pdGlvbkVycm9yIHsgV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvclR5cGU6OkFib3J0 ZWQsICJQYWdlIGlzIG5vIGxvbmdlciB2aXNpYmxlIl9zIH07Ci0gICAgc2VuZFVwZGF0ZSgqY3Vy cmVudENsaWVudElkZW50aWZpZXIsIFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uVXBkYXRlVHlw ZTo6RXJyb3IsIGVycm9yKTsKLSAgICBtX3JlY29nbml6ZXItPnJlc2V0KCk7Ci19Ci0KIHZvaWQg U3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OnNlbmRVcGRhdGUoV2ViQ29yZTo6U3BlZWNoUmVjb2du aXRpb25Db25uZWN0aW9uQ2xpZW50SWRlbnRpZmllciBjbGllbnRJZGVudGlmaWVyLCBXZWJDb3Jl OjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGUgdHlwZSwgT3B0aW9uYWw8V2ViQ29yZTo6U3Bl ZWNoUmVjb2duaXRpb25FcnJvcj4gZXJyb3IsIE9wdGlvbmFsPFZlY3RvcjxXZWJDb3JlOjpTcGVl Y2hSZWNvZ25pdGlvblJlc3VsdERhdGE+PiByZXN1bHQpCiB7CiAgICAgYXV0byB1cGRhdGUgPSBX ZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZTo6Y3JlYXRlKGNsaWVudElkZW50aWZpZXIs IHR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2du aXRpb25TZXJ2ZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9u U2VydmVyLmgKaW5kZXggYzM3Zjg5MmY1NzRhZTRmZGRkOGU2NDY0ZGUyZDI4ZGE5ZDdkM2U2MC4u ZWNiYTQwNzA5NDAzOGIzOTc2NTVlY2IwMThkYzIxN2RiYWExYWI4ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCkBAIC02Myw3ICs2 Myw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGFib3J0KFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9u Q29ubmVjdGlvbkNsaWVudElkZW50aWZpZXIpOwogICAgIHZvaWQgaW52YWxpZGF0ZShXZWJDb3Jl OjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGllbnRJZGVudGlmaWVyKTsKICAgICB2b2lk IG11dGUoKTsKLSAgICB2b2lkIGFib3J0Rm9yUGFnZUlzQmVjb21pbmdJbnZpc2libGUoKTsKIAog cHJpdmF0ZToKICAgICB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uRm9yUmVxdWVzdChXZWJDb3JlOjpT cGVlY2hSZWNvZ25pdGlvblJlcXVlc3QmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IDQyZGViYmFmYTQ2OTdmMDhlNWRlYTBkZTAxZTg3NzY2MmI1ZmQ4OWYu LjgzM2I3Y2E0OTNkZmMwODUzZjlmZGE2MTg3NzdmZDk4OGVjZGU3ODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDkyOCw2ICs0OTI4LDkgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnZpZXdJc0JlY29taW5nVmlzaWJsZSgpCiAgICAgaWYgKG1fdXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyKQogICAgICAgICBtX3VzZXJNZWRpYVBlcm1pc3Npb25S ZXF1ZXN0TWFuYWdlci0+dmlld0lzQmVjb21pbmdWaXNpYmxlKCk7CiAjZW5kaWYKKworICAgIGlm IChtX3NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIpCisgICAgICAgIG1fc3BlZWNo UmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci0+cmVzdW1lKCk7CiB9CiAKIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwg Y29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggOWFlZTVmN2MxMzA4MGUw YmM2YWU5MzhjMzAwYWQ4NDU4ZWVjZjM3OS4uYWM5YzI3NmI0NTNhY2I4YWE5NmI2NWY2NzJjZGEw NWYxMTMxMDJlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCkBAIC0xNzkwLDggKzE3OTAsMTEgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnBhZ2VNdXRl ZFN0YXRlQ2hhbmdlZChXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBpZGVudGlmaWVyLAogCiB2b2lk IFdlYlByb2Nlc3NQcm94eTo6cGFnZUlzQmVjb21pbmdJbnZpc2libGUoV2ViQ29yZTo6UGFnZUlk ZW50aWZpZXIgaWRlbnRpZmllcikKIHsKLSAgICBpZiAoYXV0byBzZXJ2ZXIgPSBtX3NwZWVjaFJl Y29nbml0aW9uU2VydmVyTWFwLmdldChpZGVudGlmaWVyKSkKLSAgICAgICAgc2VydmVyLT5hYm9y dEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCk7CisgICAgaWYgKCFSZWFsdGltZU1lZGlhU291 cmNlQ2VudGVyOjpzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZpc2liaWxpdHlDaGFuZ2UoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGF1dG8gc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIg PSBtX3NwZWVjaFJlY29nbml0aW9uU2VydmVyTWFwLmdldChpZGVudGlmaWVyKSkKKyAgICAgICAg c3BlZWNoUmVjb2duaXRpb25TZXJ2ZXItPm11dGUoKTsKIH0KIAogI2lmIFBMQVRGT1JNKFdBVENI T1MpCg== 418376 2021-01-26 00:18:28 -0800 2021-01-26 09:45:34 -0800 Patch bug-220960-20210126001827.patch text/plain 10839 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiMDUyNDNhMmRkZDEyMjFl ZmMyMTRjMjAwOWM4MWQyZDFjZjdmMjQuLmFhNTk5NGU5OWNiNDcxMWY5M2MwMDFkYTkyYTgzNmQ5 ZmMwN2FiZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDEtMjYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBNdXRlIGF1ZGlvIGNhcHR1cmUgZm9y IHNwZWVjaCByZWNvZ25pdGlvbiBiYXNlZCBvbiBzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZp c2liaWxpdHlDaGFuZ2Ugd2hlbiBwYWdlIGlzIGludmlzaWJsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgdXNlZCB0byBhYm9ydCBvbmdvaW5nIHJl Y29nbml0aW9uIHdoZW4gcGFnZSBiZWNvbWVzIGludmlzaWJsZS4gVG8gbWF0Y2ggbWVkaWEgY2Fw dHVyZSdzIGJlaGF2aW9yLCBub3cgd2Ugb25seQorICAgICAgICBhYm9ydCByZWNvZ25pdGlvbiB3 aGVuIHNob3VsZEludGVycnVwdEF1ZGlvT25QYWdlVmlzaWJpbGl0eUNoYW5nZSBpcyB0cnVlLiBB bHNvLCB3aGVuIHBhZ2UgaXMgaW52aXNpYmxlLCBub3cgd2UgCisgICAgICAgIHdpbGwgc3VzcGVu ZCBuZXcgcmVxdWVzdCBpbnN0ZWFkIG9mIGRlbnlpbmcgaXQuCisKKyAgICAgICAgVXBkYXRlZCBB UEkgdGVzdDogV2ViS2l0Mi5TcGVlY2hSZWNvZ25pdGlvblBhZ2VCZWNvbWVzSW52aXNpYmxlCisK KyAgICAgICAgKiBVSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OlNwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXI6 OmNvbnRpbnVlUHJvY2Vzc2luZ1JlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpTcGVlY2hSZWNv Z25pdGlvblBlcm1pc3Npb25NYW5hZ2VyOjpyZXN1bWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9T cGVlY2hSZWNvZ25pdGlvblBlcm1pc3Npb25NYW5hZ2VyLmg6CisgICAgICAgICogVUlQcm9jZXNz L1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3BlZWNoUmVj b2duaXRpb25TZXJ2ZXI6OmFib3J0Rm9yUGFnZUlzQmVjb21pbmdJbnZpc2libGUpOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnZpZXdJc0JlY29taW5nVmlzaWJsZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGFnZUlz QmVjb21pbmdJbnZpc2libGUpOgorCiAyMDIxLTAxLTI0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSB0aGV2ZXJnZS5jb20gLSBydWJi ZXIgYmFuZCBzY3JvbGxpbmcgYXQgdGhlIHRvcCBvZiB0aGUgcGFnZSBjYXVzZXMgYW4gYWJydXB0 IGp1bXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0 aW9uUGVybWlzc2lvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNo UmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5jcHAKaW5kZXggYTgwOGJmNmM2NGU4NWYzNDVm ZWU4ZTU5YmVmZjkxNmViNzkwMWJhYi4uZGVhZDYzOTdkMTc2ZjE5NjMzYzAyMDM2OWUxM2MyMzU1 MThmMjg3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2du aXRpb25QZXJtaXNzaW9uTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlci5jcHAKQEAgLTE2Myw3ICsxNjMsNyBA QCB2b2lkIFNwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXI6OmNvbnRpbnVlUHJvY2Vz c2luZ1JlcXVlc3QoKQogICAgIEFTU0VSVChtX3VzZXJQZXJtaXNzaW9uQ2hlY2sgPT0gQ2hlY2tS ZXN1bHQ6OkdyYW50ZWQpOwogCiAgICAgaWYgKCFtX3BhZ2UuaXNWaWV3VmlzaWJsZSgpKSB7Ci0g ICAgICAgIGNvbXBsZXRlQ3VycmVudFJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25F cnJvciB7IFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3JUeXBlOjpOb3RBbGxvd2VkLCAi UGFnZSBpcyBub3QgdmlzaWJsZSB0byB1c2VyIiB9KTsKKyAgICAgICAgbV9zdXNwZW5kZWQgPSB0 cnVlOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yNTEsNSArMjUxLDE0IEBAIHZvaWQg U3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdlcjo6ZGVjaWRlQnlEZWZhdWx0QWN0aW9u KGNvbnN0IFdlYkNvcmU6OlNlCiAjZW5kaWYKIH0KIAordm9pZCBTcGVlY2hSZWNvZ25pdGlvblBl cm1pc3Npb25NYW5hZ2VyOjpyZXN1bWUoKQoreworICAgIGlmICghbV9zdXNwZW5kZWQpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fc3VzcGVuZGVkID0gZmFsc2U7CisgICAgY29tcGxldGVDdXJy ZW50UmVxdWVzdCgpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uTWFuYWdl ci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9u TWFuYWdlci5oCmluZGV4IDI0MjU3NTk1YTI5ZjljNzA5MDBjZGU1NjkxODk0Yjk2Yjc1MzMzYzgu LjU1ODk0NTA2NTBjOTg5NzdmZDc2MjZiMGZlOWMyNGU5ZWVkYTkxNmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uUGVybWlzc2lvbk1hbmFnZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblBlcm1pc3Np b25NYW5hZ2VyLmgKQEAgLTQ0LDYgKzQ0LDggQEAgcHVibGljOgogICAgIHZvaWQgZGVjaWRlQnlE ZWZhdWx0QWN0aW9uKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChib29sKT4mJik7CiAgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4g bV9wYWdlOyB9CiAKKyAgICB2b2lkIHJlc3VtZSgpOworCiBwcml2YXRlOgogICAgIHZvaWQgc3Rh cnROZXh0UmVxdWVzdCgpOwogICAgIHZvaWQgc3RhcnRQcm9jZXNzaW5nUmVxdWVzdCgpOwpAQCAt NTgsNiArNjAsOCBAQCBwcml2YXRlOgogICAgIENoZWNrUmVzdWx0IG1fbWljcm9waG9uZUNoZWNr IHsgQ2hlY2tSZXN1bHQ6OlVua25vd24gfTsKICAgICBDaGVja1Jlc3VsdCBtX3NwZWVjaFJlY29n bml0aW9uU2VydmljZUNoZWNrIHsgQ2hlY2tSZXN1bHQ6OlVua25vd24gfTsKICAgICBDaGVja1Jl c3VsdCBtX3VzZXJQZXJtaXNzaW9uQ2hlY2sgeyBDaGVja1Jlc3VsdDo6VW5rbm93biB9OworCisg ICAgYm9vbCBtX3N1c3BlbmRlZCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9u U2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2Vy dmVyLmNwcAppbmRleCA5NWY0ZGYyMGRkYjFlMjc5NmI0Yjk2YWNhYmFhNzY0ZmM4ZGY4NjNiLi5m NjMxZTNjODY4NDAzZjkwNmE3OGNhZWM2OTkwMDk4NDY0N2I4OWVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwCkBAIC0xNjcs MjAgKzE2Nyw2IEBAIHZvaWQgU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmludmFsaWRhdGUoV2Vi Q29yZTo6U3BlZWNoUmVjb2duaXRpb25Db25uZWN0aW9uQ2xpCiAgICAgfQogfQogCi12b2lkIFNw ZWVjaFJlY29nbml0aW9uU2VydmVyOjphYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCkK LXsKLSAgICBpZiAoIW1fcmVjb2duaXplcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byBj dXJyZW50Q2xpZW50SWRlbnRpZmllciA9IG1fcmVjb2duaXplci0+Y3VycmVudENsaWVudElkZW50 aWZpZXIoKTsKLSAgICBpZiAoIWN1cnJlbnRDbGllbnRJZGVudGlmaWVyKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBhdXRvIGVycm9yID0gV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvciB7 IFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3JUeXBlOjpBYm9ydGVkLCAiUGFnZSBpcyBu byBsb25nZXIgdmlzaWJsZSJfcyB9OwotICAgIHNlbmRVcGRhdGUoKmN1cnJlbnRDbGllbnRJZGVu dGlmaWVyLCBXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGU6OkVycm9yLCBlcnJv cik7Ci0gICAgbV9yZWNvZ25pemVyLT5yZXNldCgpOwotfQotCiB2b2lkIFNwZWVjaFJlY29nbml0 aW9uU2VydmVyOjpzZW5kVXBkYXRlKFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uQ29ubmVjdGlv bkNsaWVudElkZW50aWZpZXIgY2xpZW50SWRlbnRpZmllciwgV2ViQ29yZTo6U3BlZWNoUmVjb2du aXRpb25VcGRhdGVUeXBlIHR5cGUsIE9wdGlvbmFsPFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9u RXJyb3I+IGVycm9yLCBPcHRpb25hbDxWZWN0b3I8V2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25S ZXN1bHREYXRhPj4gcmVzdWx0KQogewogICAgIGF1dG8gdXBkYXRlID0gV2ViQ29yZTo6U3BlZWNo UmVjb2duaXRpb25VcGRhdGU6OmNyZWF0ZShjbGllbnRJZGVudGlmaWVyLCB0eXBlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCmluZGV4 IGMzN2Y4OTJmNTc0YWU0ZmRkZDhlNjQ2NGRlMmQyOGRhOWQ3ZDNlNjAuLmVjYmE0MDcwOTQwMzhi Mzk3NjU1ZWNiMDE4ZGMyMTdkYmFhMWFiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaApAQCAtNjMsNyArNjMsNiBAQCBwdWJsaWM6 CiAgICAgdm9pZCBhYm9ydChXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGll bnRJZGVudGlmaWVyKTsKICAgICB2b2lkIGludmFsaWRhdGUoV2ViQ29yZTo6U3BlZWNoUmVjb2du aXRpb25Db25uZWN0aW9uQ2xpZW50SWRlbnRpZmllcik7CiAgICAgdm9pZCBtdXRlKCk7Ci0gICAg dm9pZCBhYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCk7CiAKIHByaXZhdGU6CiAgICAg dm9pZCByZXF1ZXN0UGVybWlzc2lvbkZvclJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRp b25SZXF1ZXN0Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRl eCA0MmRlYmJhZmE0Njk3ZjA4ZTVkZWEwZGUwMWU4Nzc2NjJiNWZkODlmLi44MzNiN2NhNDkzZGZj MDg1M2Y5ZmRhNjE4Nzc3ZmQ5ODhlY2RlNzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKQEAgLTQ5MjgsNiArNDkyOCw5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2 aWV3SXNCZWNvbWluZ1Zpc2libGUoKQogICAgIGlmIChtX3VzZXJNZWRpYVBlcm1pc3Npb25SZXF1 ZXN0TWFuYWdlcikKICAgICAgICAgbV91c2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIt PnZpZXdJc0JlY29taW5nVmlzaWJsZSgpOwogI2VuZGlmCisKKyAgICBpZiAobV9zcGVlY2hSZWNv Z25pdGlvblBlcm1pc3Npb25NYW5hZ2VyKQorICAgICAgICBtX3NwZWVjaFJlY29nbml0aW9uUGVy bWlzc2lvbk1hbmFnZXItPnJlc3VtZSgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZVRpdGxlRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYg dGl0bGUsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IDlhZWU1ZjdjMTMwODBlMGJjNmFlOTM4YzMwMGFk ODQ1OGVlY2YzNzkuLjI2NzdlY2Q3MTZmM2Y3M2ZkYjcyZDczYTFhOTkyOWZlOTFiNmNjNjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTc5MCw4 ICsxNzkwLDEzIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwYWdlTXV0ZWRTdGF0ZUNoYW5nZWQo V2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgaWRlbnRpZmllciwKIAogdm9pZCBXZWJQcm9jZXNzUHJv eHk6OnBhZ2VJc0JlY29taW5nSW52aXNpYmxlKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIGlkZW50 aWZpZXIpCiB7Ci0gICAgaWYgKGF1dG8gc2VydmVyID0gbV9zcGVlY2hSZWNvZ25pdGlvblNlcnZl ck1hcC5nZXQoaWRlbnRpZmllcikpCi0gICAgICAgIHNlcnZlci0+YWJvcnRGb3JQYWdlSXNCZWNv bWluZ0ludmlzaWJsZSgpOworI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisgICAgaWYgKCFSZWFs dGltZU1lZGlhU291cmNlQ2VudGVyOjpzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZpc2liaWxp dHlDaGFuZ2UoKSkKKyAgICAgICAgcmV0dXJuOworI2VuZGlmCisKKyAgICBpZiAoYXV0byBzcGVl Y2hSZWNvZ25pdGlvblNlcnZlciA9IG1fc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXJNYXAuZ2V0KGlk ZW50aWZpZXIpKQorICAgICAgICBzcGVlY2hSZWNvZ25pdGlvblNlcnZlci0+bXV0ZSgpOwogfQog CiAjaWYgUExBVEZPUk0oV0FUQ0hPUykKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBmZmJkZTQ1MjI0MTEwZWE0OThmZTEyNGYxYjQxNDMyODQ2NzUy ZjhiLi41YWExOWQxMDM3ZWI5NmNlNzAwNzY2YmM5NTlkNjhjZDViOWRhMDZlIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjEtMDEtMjYgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBN dXRlIGF1ZGlvIGNhcHR1cmUgZm9yIHNwZWVjaCByZWNvZ25pdGlvbiBiYXNlZCBvbiBzaG91bGRJ bnRlcnJ1cHRBdWRpb09uUGFnZVZpc2liaWxpdHlDaGFuZ2Ugd2hlbiBwYWdlIGlzIGludmlzaWJs ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTYw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sOgorCiAyMDIxLTAxLTI1ICBS YXp2YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgUmF6dmFu IENhbGltYW4gdG8gY29udHJpYnV0b3JzLmpzb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCmluZGV4IDdi YmU4NzI4YzE1M2EwZjQ0Y2M2YTA3YjU3YzJmZWJmODkwNmUwYjMuLmM1NmU4YzdkYWI1YjAyYmIy NjVjZTVkMmIxZmE0MDdiOTNlNGVlYzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbQpAQCAtMjAzLDcg KzIwMyw3IEBAIFRFU1QoV2ViS2l0MiwgU3BlZWNoUmVjb2duaXRpb25FcnJvcldoZW5TdGFydGlu Z0F1ZGlvQ2FwdHVyZU9uRGlmZmVyZW50UGFnZSkKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJBdWRp byBNdXRlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKIH0KIAotLy8gRklYTUU6IGVuYWJs ZSB0aGlzIHRlc3Qgb24gaU9TIHdoZW4gaHR0cHM6Ly93ZWJraXQub3JnL2IvMTc1MjA0IGlzIGZp eGVkLgorLy8gRklYTUU6IHRlc3QgdGhpcyBvbiBpT1Mgd2hlbiBodHRwczovL3dlYmtpdC5vcmcv Yi8xNzUyMDQgaXMgZml4ZWQuCiAjaWYgUExBVEZPUk0oTUFDKQogCiBURVNUKFdlYktpdDIsIFNw ZWVjaFJlY29nbml0aW9uUGFnZUJlY29tZXNJbnZpc2libGUpCkBAIC0yMjgsMTkgKzIyOCwyMyBA QCBURVNUKFdlYktpdDIsIFNwZWVjaFJlY29nbml0aW9uUGFnZUJlY29tZXNJbnZpc2libGUpCiAK ICAgICAvLyBIaWRlIHBhZ2UuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7Ci0j aWYgUExBVEZPUk0oTUFDKQogICAgIFt3ZWJWaWV3LmdldCgpLndpbmRvdyBzZXRJc1Zpc2libGU6 Tk9dOwotI2Vsc2UKLSAgICB3ZWJWaWV3LmdldCgpLndpbmRvdy5oaWRkZW4gPSBZRVM7Ci0jZW5k aWYKKyAgICBVdGlsOjpzbGVlcCgwLjEpOworICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZFNjcmlw dE1lc3NhZ2UpOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJz dG9wKCkiXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVz c2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAiRXJyb3I6IGFib3J0ZWQgLSBQYWdlIGlzIG5v IGxvbmdlciB2aXNpYmxlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJFbmQiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogCiAgICAgLy8gUGFn ZSBpcyBpbnZpc2libGUuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7Ci0gICAg W3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAic3RhcnQoKSIgY29tcGxldGlvbkhhbmRsZXI6 bmlsXTsKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAic3RhcnQo KSJdOworICAgIFV0aWw6OnNsZWVwKDAuMSk7CisgICAgRVhQRUNUX0ZBTFNFKHJlY2VpdmVkU2Ny aXB0TWVzc2FnZSk7CisKKyAgICAvLyBVbmhpZGUgcGFnZS4KKyAgICBbd2ViVmlldy5nZXQoKS53 aW5kb3cgc2V0SXNWaXNpYmxlOllFU107CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZy ZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOwotICAgIEVYUEVDVF9XS19TVFJFUShAIkVycm9yOiBub3Qt YWxsb3dlZCAtIFBhZ2UgaXMgbm90IHZpc2libGUgdG8gdXNlciIsIFtsYXN0U2NyaXB0TWVzc2Fn ZSBib2R5XSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAiU3RhcnQiLCBbbGFzdFNjcmlwdE1lc3Nh Z2UgYm9keV0pOwogfQogCiBURVNUKFdlYktpdDIsIFNwZWVjaFJlY29nbml0aW9uUGFnZUlzRGVz dHJveWVkKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sCmluZGV4IGM2N2QwYzcx MDYyYjljNDE2YWY4MWFmMmY4ZTIxZDY5ZmI0MDYzMzMuLmZkYjM0NzEzY2UxNGE3NGQxZWY3NTY4 MTRiMGZmMTNjNjI0MjIxMDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2Evc3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwK QEAgLTEzLDYgKzEzLDcgQEAgZnVuY3Rpb24gc3RhcnQoKQogICAgICAgICBzcGVlY2hSZWNvZ25p dGlvbiA9IG5ldyB3ZWJraXRTcGVlY2hSZWNvZ25pdGlvbigpOwogICAgIHNwZWVjaFJlY29nbml0 aW9uLmNvbnRpbnVvdXMgPSB0cnVlOwogICAgIHNwZWVjaFJlY29nbml0aW9uLm9uc3RhcnQgPSAo KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2Fn ZSgiU3RhcnQiKTsKKyAgICBzcGVlY2hSZWNvZ25pdGlvbi5vbmVuZCA9ICgpID0+IHdpbmRvdy53 ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJFbmQiKTsKICAg ICBzcGVlY2hSZWNvZ25pdGlvbi5vbmVycm9yID0gKGV2ZW50KSA9PiB3aW5kb3cud2Via2l0Lm1l c3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiRXJyb3I6ICIgKyBldmVudC5l cnJvciArICIgLSAiICsgIGV2ZW50Lm1lc3NhZ2UpOwogCiAgICAgc3BlZWNoUmVjb2duaXRpb24u c3RhcnQoKTsK 418432 2021-01-26 09:45:36 -0800 2021-01-26 15:24:40 -0800 Patch bug-220960-20210126094535.patch text/plain 7856 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiMDUyNDNhMmRkZDEyMjFl ZmMyMTRjMjAwOWM4MWQyZDFjZjdmMjQuLjEwYjJmODg2ZWFjYjczY2RkMTQ0MmZhNjA1YmVkM2Uw ZGY0OWU3M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDEtMjYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBNdXRlIGF1ZGlvIGNhcHR1cmUgZm9y IHNwZWVjaCByZWNvZ25pdGlvbiBiYXNlZCBvbiBzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZp c2liaWxpdHlDaGFuZ2Ugd2hlbiBwYWdlIGlzIGludmlzaWJsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgdXNlZCB0byBhYm9ydCBvbmdvaW5nIHJl Y29nbml0aW9uIHdoZW4gcGFnZSBiZWNvbWVzIGludmlzaWJsZS4gVG8gbWF0Y2ggbWVkaWEgY2Fw dHVyZSdzIGJlaGF2aW9yLCBub3cgd2Ugb25seQorICAgICAgICBhYm9ydCByZWNvZ25pdGlvbiB3 aGVuIHNob3VsZEludGVycnVwdEF1ZGlvT25QYWdlVmlzaWJpbGl0eUNoYW5nZSBpcyB0cnVlLgor CisgICAgICAgIFVwZGF0ZWQgQVBJIHRlc3Q6IFdlYktpdDIuU3BlZWNoUmVjb2duaXRpb25QYWdl QmVjb21lc0ludmlzaWJsZQorCisgICAgICAgICogVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9u U2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmFi b3J0Rm9yUGFnZUlzQmVjb21pbmdJbnZpc2libGUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJv Y2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnBhZ2VJ c0JlY29taW5nSW52aXNpYmxlKToKKwogMjAyMS0wMS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIFdLMl0gdGhldmVyZ2UuY29tIC0gcnVi YmVyIGJhbmQgc2Nyb2xsaW5nIGF0IHRoZSB0b3Agb2YgdGhlIHBhZ2UgY2F1c2VzIGFuIGFicnVw dCBqdW1wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25p dGlvblNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlv blNlcnZlci5jcHAKaW5kZXggOTVmNGRmMjBkZGIxZTI3OTZiNGI5NmFjYWJhYTc2NGZjOGRmODYz Yi4uZjYzMWUzYzg2ODQwM2Y5MDZhNzhjYWVjNjk5MDA5ODQ2NDdiODllZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmNwcApAQCAt MTY3LDIwICsxNjcsNiBAQCB2b2lkIFNwZWVjaFJlY29nbml0aW9uU2VydmVyOjppbnZhbGlkYXRl KFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uQ29ubmVjdGlvbkNsaQogICAgIH0KIH0KIAotdm9p ZCBTcGVlY2hSZWNvZ25pdGlvblNlcnZlcjo6YWJvcnRGb3JQYWdlSXNCZWNvbWluZ0ludmlzaWJs ZSgpCi17Ci0gICAgaWYgKCFtX3JlY29nbml6ZXIpCi0gICAgICAgIHJldHVybjsKLQotICAgIGF1 dG8gY3VycmVudENsaWVudElkZW50aWZpZXIgPSBtX3JlY29nbml6ZXItPmN1cnJlbnRDbGllbnRJ ZGVudGlmaWVyKCk7Ci0gICAgaWYgKCFjdXJyZW50Q2xpZW50SWRlbnRpZmllcikKLSAgICAgICAg cmV0dXJuOwotCi0gICAgYXV0byBlcnJvciA9IFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJy b3IgeyBXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkVycm9yVHlwZTo6QWJvcnRlZCwgIlBhZ2Ug aXMgbm8gbG9uZ2VyIHZpc2libGUiX3MgfTsKLSAgICBzZW5kVXBkYXRlKCpjdXJyZW50Q2xpZW50 SWRlbnRpZmllciwgV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25VcGRhdGVUeXBlOjpFcnJvciwg ZXJyb3IpOwotICAgIG1fcmVjb2duaXplci0+cmVzZXQoKTsKLX0KLQogdm9pZCBTcGVlY2hSZWNv Z25pdGlvblNlcnZlcjo6c2VuZFVwZGF0ZShXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5l Y3Rpb25DbGllbnRJZGVudGlmaWVyIGNsaWVudElkZW50aWZpZXIsIFdlYkNvcmU6OlNwZWVjaFJl Y29nbml0aW9uVXBkYXRlVHlwZSB0eXBlLCBPcHRpb25hbDxXZWJDb3JlOjpTcGVlY2hSZWNvZ25p dGlvbkVycm9yPiBlcnJvciwgT3B0aW9uYWw8VmVjdG9yPFdlYkNvcmU6OlNwZWVjaFJlY29nbml0 aW9uUmVzdWx0RGF0YT4+IHJlc3VsdCkKIHsKICAgICBhdXRvIHVwZGF0ZSA9IFdlYkNvcmU6OlNw ZWVjaFJlY29nbml0aW9uVXBkYXRlOjpjcmVhdGUoY2xpZW50SWRlbnRpZmllciwgdHlwZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZl ci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaApp bmRleCBjMzdmODkyZjU3NGFlNGZkZGQ4ZTY0NjRkZTJkMjhkYTlkN2QzZTYwLi5lY2JhNDA3MDk0 MDM4YjM5NzY1NWVjYjAxOGRjMjE3ZGJhYTFhYjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmgKQEAgLTYzLDcgKzYzLDYgQEAgcHVi bGljOgogICAgIHZvaWQgYWJvcnQoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25Db25uZWN0aW9u Q2xpZW50SWRlbnRpZmllcik7CiAgICAgdm9pZCBpbnZhbGlkYXRlKFdlYkNvcmU6OlNwZWVjaFJl Y29nbml0aW9uQ29ubmVjdGlvbkNsaWVudElkZW50aWZpZXIpOwogICAgIHZvaWQgbXV0ZSgpOwot ICAgIHZvaWQgYWJvcnRGb3JQYWdlSXNCZWNvbWluZ0ludmlzaWJsZSgpOwogCiBwcml2YXRlOgog ICAgIHZvaWQgcmVxdWVzdFBlcm1pc3Npb25Gb3JSZXF1ZXN0KFdlYkNvcmU6OlNwZWVjaFJlY29n bml0aW9uUmVxdWVzdCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKaW5kZXggOWFlZTVmN2MxMzA4MGUwYmM2YWU5MzhjMzAwYWQ4NDU4ZWVjZjM3OS4uMjY3 N2VjZDcxNmYzZjczZmRiNzJkNzNhMWE5OTI5ZmU5MWI2Y2M2MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0xNzkwLDggKzE3OTAsMTMgQEAgdm9p ZCBXZWJQcm9jZXNzUHJveHk6OnBhZ2VNdXRlZFN0YXRlQ2hhbmdlZChXZWJDb3JlOjpQYWdlSWRl bnRpZmllciBpZGVudGlmaWVyLAogCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cGFnZUlzQmVjb21p bmdJbnZpc2libGUoV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgaWRlbnRpZmllcikKIHsKLSAgICBp ZiAoYXV0byBzZXJ2ZXIgPSBtX3NwZWVjaFJlY29nbml0aW9uU2VydmVyTWFwLmdldChpZGVudGlm aWVyKSkKLSAgICAgICAgc2VydmVyLT5hYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCk7 CisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBpZiAoIVJlYWx0aW1lTWVkaWFTb3VyY2VD ZW50ZXI6OnNob3VsZEludGVycnVwdEF1ZGlvT25QYWdlVmlzaWJpbGl0eUNoYW5nZSgpKQorICAg ICAgICByZXR1cm47CisjZW5kaWYKKworICAgIGlmIChhdXRvIHNwZWVjaFJlY29nbml0aW9uU2Vy dmVyID0gbV9zcGVlY2hSZWNvZ25pdGlvblNlcnZlck1hcC5nZXQoaWRlbnRpZmllcikpCisgICAg ICAgIHNwZWVjaFJlY29nbml0aW9uU2VydmVyLT5tdXRlKCk7CiB9CiAKICNpZiBQTEFURk9STShX QVRDSE9TKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IGZmYmRlNDUyMjQxMTBlYTQ5OGZlMTI0ZjFiNDE0MzI4NDY3NTJmOGIuLjVhYTE5ZDEwMzdl Yjk2Y2U3MDA3NjZiYzk1OWQ2OGNkNWI5ZGEwNmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMS0yNiAgU2lo dWkgTGl1ICA8c2lodWlfbGl1QGFwcGUuY29tPgorCisgICAgICAgIE11dGUgYXVkaW8gY2FwdHVy ZSBmb3Igc3BlZWNoIHJlY29nbml0aW9uIGJhc2VkIG9uIHNob3VsZEludGVycnVwdEF1ZGlvT25Q YWdlVmlzaWJpbGl0eUNoYW5nZSB3aGVuIHBhZ2UgaXMgaW52aXNpYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NjAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVj aHJlY29nbml0aW9uLWJhc2ljLmh0bWw6CisKIDIwMjEtMDEtMjUgIFJhenZhbiBDYWxpbWFuICA8 cmNhbGltYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBSYXp2YW4gQ2FsaW1hbiB0byBjb250 cmlidXRvcnMuanNvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0KaW5kZXggN2JiZTg3MjhjMTUzYTBmNDRj YzZhMDdiNTdjMmZlYmY4OTA2ZTBiMy4uMzhhYjE3NWQxZmQzMTA5M2M0ODMyNzA2YTJiODA4ODFj ODdlZGM4YiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9TcGVlY2hSZWNvZ25pdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCkBAIC0yMDMsNyArMjAzLDcgQEAgVEVTVChX ZWJLaXQyLCBTcGVlY2hSZWNvZ25pdGlvbkVycm9yV2hlblN0YXJ0aW5nQXVkaW9DYXB0dXJlT25E aWZmZXJlbnRQYWdlKQogICAgIEVYUEVDVF9XS19TVFJFUShAIkF1ZGlvIE11dGUiLCBbbGFzdFNj cmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCi0vLyBGSVhNRTogZW5hYmxlIHRoaXMgdGVzdCBvbiBp T1Mgd2hlbiBodHRwczovL3dlYmtpdC5vcmcvYi8xNzUyMDQgaXMgZml4ZWQuCisvLyBGSVhNRTog dGVzdCB0aGlzIG9uIGlPUyB3aGVuIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3NTIwNCBpcyBmaXhl ZC4KICNpZiBQTEFURk9STShNQUMpCiAKIFRFU1QoV2ViS2l0MiwgU3BlZWNoUmVjb2duaXRpb25Q YWdlQmVjb21lc0ludmlzaWJsZSkKQEAgLTIyMiwxOSArMjIyLDE5IEBAIFRFU1QoV2ViS2l0Miwg U3BlZWNoUmVjb2duaXRpb25QYWdlQmVjb21lc0ludmlzaWJsZSkKICAgICBzaG91bGRHcmFudFBl cm1pc3Npb25SZXF1ZXN0ID0gdHJ1ZTsKICAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxz ZTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJzcGVlY2hy ZWNvZ25pdGlvbi1iYXNpYyJdOwotICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFT Y3JpcHQ6QCJzdGFydCgpIl07CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAic2V0 U2hvdWxkSGFuZGxlRW5kRXZlbnQodHJ1ZSk7IHN0YXJ0KCk7IiBjb21wbGV0aW9uSGFuZGxlcjpu aWxdOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdl KTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJTdGFydCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5 XSk7CiAKICAgICAvLyBIaWRlIHBhZ2UuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFs c2U7Ci0jaWYgUExBVEZPUk0oTUFDKQogICAgIFt3ZWJWaWV3LmdldCgpLndpbmRvdyBzZXRJc1Zp c2libGU6Tk9dOwotI2Vsc2UKLSAgICB3ZWJWaWV3LmdldCgpLndpbmRvdy5oaWRkZW4gPSBZRVM7 Ci0jZW5kaWYKKyAgICBVdGlsOjpzbGVlcCgwLjEpOworICAgIC8vIE9uZ29pbmcgcmVjb2duaXRp b24gZG9lcyBub3Qgc3RvcCBhdXRvbWF0aWNhbGx5LgorICAgIEVYUEVDVF9GQUxTRShyZWNlaXZl ZFNjcmlwdE1lc3NhZ2UpOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3Jp cHQ6QCJzdG9wKCkiXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2Ny aXB0TWVzc2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAiRXJyb3I6IGFib3J0ZWQgLSBQYWdl IGlzIG5vIGxvbmdlciB2aXNpYmxlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKKyAgICBF WFBFQ1RfV0tfU1RSRVEoQCJFbmQiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogCiAgICAg Ly8gUGFnZSBpcyBpbnZpc2libGUuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7 CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVj aHJlY29nbml0aW9uLWJhc2ljLmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwKaW5kZXggYzY3ZDBjNzEwNjJiOWM0 MTZhZjgxYWYyZjhlMjFkNjlmYjQwNjMzMy4uYzkzYTg0MzZiOWUwODc0OGIyZTU3NGYzNzA4OGY0 Yzk4ZGY4ZjFhYSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2Evc3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbApAQCAtNiw2 ICs2LDEyIEBACiAKIHZhciBzcGVlY2hSZWNvZ25pdGlvbiA9IG51bGw7CiB2YXIgcmVjb3JkZXIg PSBudWxsOwordmFyIHNob3VsZEhhbmRsZUVuZEV2ZW50ID0gZmFsc2U7CisKK2Z1bmN0aW9uIHNl dFNob3VsZEhhbmRsZUVuZEV2ZW50KHNob3VsZEhhbmRsZUV2ZW50KQoreworICAgIHNob3VsZEhh bmRsZUVuZEV2ZW50ID0gc2hvdWxkSGFuZGxlRXZlbnQ7Cit9CiAKIGZ1bmN0aW9uIHN0YXJ0KCkK IHsKQEAgLTE0LDYgKzIwLDggQEAgZnVuY3Rpb24gc3RhcnQoKQogICAgIHNwZWVjaFJlY29nbml0 aW9uLmNvbnRpbnVvdXMgPSB0cnVlOwogICAgIHNwZWVjaFJlY29nbml0aW9uLm9uc3RhcnQgPSAo KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2Fn ZSgiU3RhcnQiKTsKICAgICBzcGVlY2hSZWNvZ25pdGlvbi5vbmVycm9yID0gKGV2ZW50KSA9PiB3 aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiRXJy b3I6ICIgKyBldmVudC5lcnJvciArICIgLSAiICsgIGV2ZW50Lm1lc3NhZ2UpOworICAgIGlmIChz aG91bGRIYW5kbGVFbmRFdmVudCkKKyAgICAgICAgc3BlZWNoUmVjb2duaXRpb24ub25lbmQgPSAo KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2Fn ZSgiRW5kIik7CiAKICAgICBzcGVlY2hSZWNvZ25pdGlvbi5zdGFydCgpOwogfQo= 418479 2021-01-26 15:24:42 -0800 2021-01-26 20:54:17 -0800 Patch bug-220960-20210126152441.patch text/plain 8177 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyNDI5NDRkYmZlNDIzOWY5 NDg3MmQ4N2YwOGExOGRkNmQ4MTUyOGUuLmZmODAwM2Y5YWU1MWNjZDZiNGQyMGViMWQ3YmM4NWU5 OWI5NTJmM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDEtMjYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBNdXRlIGF1ZGlvIGNhcHR1cmUgZm9y IHNwZWVjaCByZWNvZ25pdGlvbiBiYXNlZCBvbiBzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZp c2liaWxpdHlDaGFuZ2Ugd2hlbiBwYWdlIGlzIGludmlzaWJsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBXZSB1c2VkIHRvIGFib3J0IG9uZ29pbmcgcmVj b2duaXRpb24gd2hlbiBwYWdlIGJlY29tZXMgaW52aXNpYmxlLiBUbyBtYXRjaCBtZWRpYSBjYXB0 dXJlJ3MgYmVoYXZpb3IsIG5vdyB3ZSBvbmx5CisgICAgICAgIGFib3J0IHJlY29nbml0aW9uIHdo ZW4gc2hvdWxkSW50ZXJydXB0QXVkaW9PblBhZ2VWaXNpYmlsaXR5Q2hhbmdlIGlzIHRydWUuCisK KyAgICAgICAgVXBkYXRlZCBBUEkgdGVzdDogV2ViS2l0Mi5TcGVlY2hSZWNvZ25pdGlvblBhZ2VC ZWNvbWVzSW52aXNpYmxlCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25T ZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTcGVlY2hSZWNvZ25pdGlvblNlcnZlcjo6YWJv cnRGb3JQYWdlSXNCZWNvbWluZ0ludmlzaWJsZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGFnZUlz QmVjb21pbmdJbnZpc2libGUpOgorCiAyMDIxLTAxLTI2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdo YW1AYXBwbGUuY29tPgogCiAgICAgICAgIEhhcmRlbiBOZXR3b3JrUHJvY2VzcyBhZ2FpbnN0IGlu dGVnZXIgb3ZlcmZsb3cgaW4gQ2FjaGVTdG9yYWdlRW5naW5lIHNpemUgY2FsY3VsYXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVy LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmNw cAppbmRleCA5NWY0ZGYyMGRkYjFlMjc5NmI0Yjk2YWNhYmFhNzY0ZmM4ZGY4NjNiLi5mNjMxZTNj ODY4NDAzZjkwNmE3OGNhZWM2OTkwMDk4NDY0N2I4OWVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwCkBAIC0xNjcsMjAgKzE2 Nyw2IEBAIHZvaWQgU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmludmFsaWRhdGUoV2ViQ29yZTo6 U3BlZWNoUmVjb2duaXRpb25Db25uZWN0aW9uQ2xpCiAgICAgfQogfQogCi12b2lkIFNwZWVjaFJl Y29nbml0aW9uU2VydmVyOjphYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCkKLXsKLSAg ICBpZiAoIW1fcmVjb2duaXplcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byBjdXJyZW50 Q2xpZW50SWRlbnRpZmllciA9IG1fcmVjb2duaXplci0+Y3VycmVudENsaWVudElkZW50aWZpZXIo KTsKLSAgICBpZiAoIWN1cnJlbnRDbGllbnRJZGVudGlmaWVyKQotICAgICAgICByZXR1cm47Ci0K LSAgICBhdXRvIGVycm9yID0gV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJvciB7IFdlYkNv cmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3JUeXBlOjpBYm9ydGVkLCAiUGFnZSBpcyBubyBsb25n ZXIgdmlzaWJsZSJfcyB9OwotICAgIHNlbmRVcGRhdGUoKmN1cnJlbnRDbGllbnRJZGVudGlmaWVy LCBXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGU6OkVycm9yLCBlcnJvcik7Ci0g ICAgbV9yZWNvZ25pemVyLT5yZXNldCgpOwotfQotCiB2b2lkIFNwZWVjaFJlY29nbml0aW9uU2Vy dmVyOjpzZW5kVXBkYXRlKFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uQ29ubmVjdGlvbkNsaWVu dElkZW50aWZpZXIgY2xpZW50SWRlbnRpZmllciwgV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25V cGRhdGVUeXBlIHR5cGUsIE9wdGlvbmFsPFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3I+ IGVycm9yLCBPcHRpb25hbDxWZWN0b3I8V2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25SZXN1bHRE YXRhPj4gcmVzdWx0KQogewogICAgIGF1dG8gdXBkYXRlID0gV2ViQ29yZTo6U3BlZWNoUmVjb2du aXRpb25VcGRhdGU6OmNyZWF0ZShjbGllbnRJZGVudGlmaWVyLCB0eXBlKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCmluZGV4IGMzN2Y4 OTJmNTc0YWU0ZmRkZDhlNjQ2NGRlMmQyOGRhOWQ3ZDNlNjAuLmVjYmE0MDcwOTQwMzhiMzk3NjU1 ZWNiMDE4ZGMyMTdkYmFhMWFiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaApAQCAtNjMsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAg dm9pZCBhYm9ydChXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGllbnRJZGVu dGlmaWVyKTsKICAgICB2b2lkIGludmFsaWRhdGUoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25D b25uZWN0aW9uQ2xpZW50SWRlbnRpZmllcik7CiAgICAgdm9pZCBtdXRlKCk7Ci0gICAgdm9pZCBh Ym9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBy ZXF1ZXN0UGVybWlzc2lvbkZvclJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25SZXF1 ZXN0Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRl eCA5YWVlNWY3YzEzMDgwZTBiYzZhZTkzOGMzMDBhZDg0NThlZWNmMzc5Li4yNjc3ZWNkNzE2ZjNm NzNmZGI3MmQ3M2ExYTk5MjlmZTkxYjZjYzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTE3OTAsOCArMTc5MCwxMyBAQCB2b2lkIFdlYlByb2Nl c3NQcm94eTo6cGFnZU11dGVkU3RhdGVDaGFuZ2VkKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIGlk ZW50aWZpZXIsCiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwYWdlSXNCZWNvbWluZ0ludmlzaWJs ZShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBpZGVudGlmaWVyKQogewotICAgIGlmIChhdXRvIHNl cnZlciA9IG1fc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXJNYXAuZ2V0KGlkZW50aWZpZXIpKQotICAg ICAgICBzZXJ2ZXItPmFib3J0Rm9yUGFnZUlzQmVjb21pbmdJbnZpc2libGUoKTsKKyNpZiBFTkFC TEUoTUVESUFfU1RSRUFNKQorICAgIGlmICghUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6c2hv dWxkSW50ZXJydXB0QXVkaW9PblBhZ2VWaXNpYmlsaXR5Q2hhbmdlKCkpCisgICAgICAgIHJldHVy bjsKKyNlbmRpZgorCisgICAgaWYgKGF1dG8gc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIgPSBtX3Nw ZWVjaFJlY29nbml0aW9uU2VydmVyTWFwLmdldChpZGVudGlmaWVyKSkKKyAgICAgICAgc3BlZWNo UmVjb2duaXRpb25TZXJ2ZXItPm11dGUoKTsKIH0KIAogI2lmIFBMQVRGT1JNKFdBVENIT1MpCmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDkyMGRm NGRkMTgwZTJiMWMyNTZiMzY1Y2RhMWNmNTlmZWJmYzkwNC4uMzRlY2IzMGUwZjVhNDA5N2U4ZWI1 ZDZhNzM0ZmM1ODIxNDRmYzk0NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI2ICBTaWh1aSBMaXUgIDxz aWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgTXV0ZSBhdWRpbyBjYXB0dXJlIGZvciBzcGVl Y2ggcmVjb2duaXRpb24gYmFzZWQgb24gc2hvdWxkSW50ZXJydXB0QXVkaW9PblBhZ2VWaXNpYmls aXR5Q2hhbmdlIHdoZW4gcGFnZSBpcyBpbnZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk2MAorCisgICAgICAgIFJldmlld2VkIGJ5IFlv dWVubiBGYWJsZXQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1NwZWVjaFJlY29nbml0aW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlv bi1iYXNpYy5odG1sOgorCiAyMDIxLTAxLTI2ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHTElCXSBBUEkgdGVzdHMgZmFpbCB0byByZXBvcnQgaGFybmVzcyBm YWlsdXJlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9TcGVlY2hSZWNvZ25pdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0KaW5kZXggN2JiZTg3MjhjMTUzYTBmNDRjYzZhMDdi NTdjMmZlYmY4OTA2ZTBiMy4uZjQ0YTA3YTljODQyODE3MTIzZWQ0NWE5NzhiZTI3MTMwNTc4ZTcy NiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVl Y2hSZWNvZ25pdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1NwZWVjaFJlY29nbml0aW9uLm1tCkBAIC0yMDMsNyArMjAzLDcgQEAgVEVTVChXZWJLaXQy LCBTcGVlY2hSZWNvZ25pdGlvbkVycm9yV2hlblN0YXJ0aW5nQXVkaW9DYXB0dXJlT25EaWZmZXJl bnRQYWdlKQogICAgIEVYUEVDVF9XS19TVFJFUShAIkF1ZGlvIE11dGUiLCBbbGFzdFNjcmlwdE1l c3NhZ2UgYm9keV0pOwogfQogCi0vLyBGSVhNRTogZW5hYmxlIHRoaXMgdGVzdCBvbiBpT1Mgd2hl biBodHRwczovL3dlYmtpdC5vcmcvYi8xNzUyMDQgaXMgZml4ZWQuCisvLyBGSVhNRTogdGVzdCB0 aGlzIG9uIGlPUyB3aGVuIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3NTIwNCBpcyBmaXhlZC4KICNp ZiBQTEFURk9STShNQUMpCiAKIFRFU1QoV2ViS2l0MiwgU3BlZWNoUmVjb2duaXRpb25QYWdlQmVj b21lc0ludmlzaWJsZSkKQEAgLTIyMiwyMyArMjIyLDIzIEBAIFRFU1QoV2ViS2l0MiwgU3BlZWNo UmVjb2duaXRpb25QYWdlQmVjb21lc0ludmlzaWJsZSkKICAgICBzaG91bGRHcmFudFBlcm1pc3Np b25SZXF1ZXN0ID0gdHJ1ZTsKICAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsKICAg ICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJzcGVlY2hyZWNvZ25p dGlvbi1iYXNpYyJdOwotICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6 QCJzdGFydCgpIl07CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAic2V0U2hvdWxk SGFuZGxlRW5kRXZlbnQodHJ1ZSk7IHN0YXJ0KCk7IiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwog ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJTdGFydCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiAK ICAgICAvLyBIaWRlIHBhZ2UuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7Ci0j aWYgUExBVEZPUk0oTUFDKQogICAgIFt3ZWJWaWV3LmdldCgpLndpbmRvdyBzZXRJc1Zpc2libGU6 Tk9dOwotI2Vsc2UKLSAgICB3ZWJWaWV3LmdldCgpLndpbmRvdy5oaWRkZW4gPSBZRVM7Ci0jZW5k aWYKKyAgICBVdGlsOjpzbGVlcCgwLjEpOworICAgIC8vIE9uZ29pbmcgcmVjb2duaXRpb24gZG9l cyBub3Qgc3RvcCBhdXRvbWF0aWNhbGx5LgorICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZFNjcmlw dE1lc3NhZ2UpOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJz dG9wKCkiXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVz c2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAiRXJyb3I6IGFib3J0ZWQgLSBQYWdlIGlzIG5v IGxvbmdlciB2aXNpYmxlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJFbmQiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogCiAgICAgLy8gUGFn ZSBpcyBpbnZpc2libGUuCiAgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7Ci0gICAg W3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAic3RhcnQoKSIgY29tcGxldGlvbkhhbmRsZXI6 bmlsXTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJzZXRTaG91bGRIYW5kbGVF bmRFdmVudChmYWxzZSk7IHN0YXJ0KCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CiAgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOwogICAgIEVYUEVD VF9XS19TVFJFUShAIkVycm9yOiBub3QtYWxsb3dlZCAtIFBhZ2UgaXMgbm90IHZpc2libGUgdG8g dXNlciIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0 bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0 aW9uLWJhc2ljLmh0bWwKaW5kZXggYzY3ZDBjNzEwNjJiOWM0MTZhZjgxYWYyZjhlMjFkNjlmYjQw NjMzMy4uYzkzYTg0MzZiOWUwODc0OGIyZTU3NGYzNzA4OGY0Yzk4ZGY4ZjFhYSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlv bi1iYXNpYy5odG1sCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev c3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbApAQCAtNiw2ICs2LDEyIEBACiAKIHZhciBzcGVl Y2hSZWNvZ25pdGlvbiA9IG51bGw7CiB2YXIgcmVjb3JkZXIgPSBudWxsOwordmFyIHNob3VsZEhh bmRsZUVuZEV2ZW50ID0gZmFsc2U7CisKK2Z1bmN0aW9uIHNldFNob3VsZEhhbmRsZUVuZEV2ZW50 KHNob3VsZEhhbmRsZUV2ZW50KQoreworICAgIHNob3VsZEhhbmRsZUVuZEV2ZW50ID0gc2hvdWxk SGFuZGxlRXZlbnQ7Cit9CiAKIGZ1bmN0aW9uIHN0YXJ0KCkKIHsKQEAgLTE0LDYgKzIwLDggQEAg ZnVuY3Rpb24gc3RhcnQoKQogICAgIHNwZWVjaFJlY29nbml0aW9uLmNvbnRpbnVvdXMgPSB0cnVl OwogICAgIHNwZWVjaFJlY29nbml0aW9uLm9uc3RhcnQgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1l c3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiU3RhcnQiKTsKICAgICBzcGVl Y2hSZWNvZ25pdGlvbi5vbmVycm9yID0gKGV2ZW50KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VI YW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiRXJyb3I6ICIgKyBldmVudC5lcnJvciAr ICIgLSAiICsgIGV2ZW50Lm1lc3NhZ2UpOworICAgIGlmIChzaG91bGRIYW5kbGVFbmRFdmVudCkK KyAgICAgICAgc3BlZWNoUmVjb2duaXRpb24ub25lbmQgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1l c3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiRW5kIik7CiAKICAgICBzcGVl Y2hSZWNvZ25pdGlvbi5zdGFydCgpOwogfQo= 418502 2021-01-26 20:54:18 -0800 2021-01-26 22:31:12 -0800 Patch bug-220960-20210126205417.patch text/plain 10502 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRjMWU4MWVhZWMxYmM1 ZDViNDNmN2VjMjZjYzE2MTk5NDI1ZDE2Ny4uNTg4ZWFhMjI2YTNiZGJmZjdhNjZjZDM0YTBkYWEy MDMxNzE0ZDM3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTI2ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgTXV0ZSBhdWRpbyBjYXB0dXJl IGZvciBzcGVlY2ggcmVjb2duaXRpb24gYmFzZWQgb24gc2hvdWxkSW50ZXJydXB0QXVkaW9PblBh Z2VWaXNpYmlsaXR5Q2hhbmdlIHdoZW4gcGFnZSBpcyBpbnZpc2libGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk2MAorCisgICAgICAgIFJldmll d2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgQWRkIGEgYm9vbGVhbiB0byBpbmRpY2F0 ZSByZWNvZ25pdGlvbiBzdGF0ZSBzbyB3ZSBkb24ndCBzZW5kIGVuZCBldmVudCB0d2ljZS4KKwor ICAgICAgICAqIE1vZHVsZXMvc3BlZWNoL1NwZWVjaFJlY29nbml6ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3BlZWNoUmVjb2duaXplcjo6c3RhcnRSZWNvZ25pdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpTcGVlY2hSZWNvZ25pemVyOjphYm9ydFJlY29nbml0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlNwZWVjaFJlY29nbml6ZXI6OnN0b3BSZWNvZ25pdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpTcGVlY2hSZWNvZ25pemVyOjpyZXNldFJlY29nbml0aW9uKToKKyAgICAgICAgKiBNb2R1 bGVzL3NwZWVjaC9TcGVlY2hSZWNvZ25pemVyLmg6CisKIDIwMjEtMDEtMjYgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCBjcmVhdGUg ZW1wdHkgcnVucyBmb3IgZW1wdHkgbGluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNWQwNmFlMTI4Zjc1NTAwOWQy MmI4NWJlODU1ZDdkNjNiZGY3NTgwMi4uZjZlZDllOGIyNTM2OTI4NGFiMDM1MDE5ZGZiN2Y2OGY5 NTU2MzY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wMS0yNiAgU2lodWkgTGl1 ICA8c2lodWlfbGl1QGFwcGUuY29tPgorCisgICAgICAgIE11dGUgYXVkaW8gY2FwdHVyZSBmb3Ig c3BlZWNoIHJlY29nbml0aW9uIGJhc2VkIG9uIHNob3VsZEludGVycnVwdEF1ZGlvT25QYWdlVmlz aWJpbGl0eUNoYW5nZSB3aGVuIHBhZ2UgaXMgaW52aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIFdlIHVzZWQgdG8gYWJvcnQgb25nb2luZyByZWNv Z25pdGlvbiB3aGVuIHBhZ2UgYmVjb21lcyBpbnZpc2libGUuIFRvIG1hdGNoIG1lZGlhIGNhcHR1 cmUncyBiZWhhdmlvciwgbm93IHdlIG9ubHkKKyAgICAgICAgYWJvcnQgcmVjb2duaXRpb24gd2hl biBzaG91bGRJbnRlcnJ1cHRBdWRpb09uUGFnZVZpc2liaWxpdHlDaGFuZ2UgaXMgdHJ1ZS4KKwor ICAgICAgICBVcGRhdGVkIEFQSSB0ZXN0OiBXZWJLaXQyLlNwZWVjaFJlY29nbml0aW9uUGFnZUJl Y29tZXNJbnZpc2libGUKKworICAgICAgICAqIFVJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNl cnZlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNwZWVjaFJlY29nbml0aW9uU2VydmVyOjphYm9y dEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nl c3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpwYWdlSXNC ZWNvbWluZ0ludmlzaWJsZSk6CisKIDIwMjEtMDEtMjYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgogCiAgICAgICAgIEV4cG9zZSB0aGUgdmFsdWUgb2YgYDxtZXRhIG5hbWU9InRo ZW1lLWNvbG9yIiBjb250ZW50PSIuLi4iPmAgYXMgU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3NwZWVjaC9TcGVlY2hSZWNvZ25pemVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvc3BlZWNoL1NwZWVjaFJlY29nbml6ZXIuY3BwCmluZGV4IDY3YjIxZDQ3MWZmZjc3 ODZkMmI1ZjkwMzhkYmZiNWRhNmVlY2NhYWMuLmNhZDQ4YTk3NDJiYjllMDE0MzRmYmE4NWRkMGMx MGE5YzAxZmY0ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3BlZWNoL1Nw ZWVjaFJlY29nbml6ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3BlZWNoL1Nw ZWVjaFJlY29nbml6ZXIuY3BwCkBAIC0xMTgsMjEgKzExOCwyNiBAQCB2b2lkIFNwZWVjaFJlY29n bml6ZXI6OmRhdGFDYXB0dXJlZChjb25zdCBNZWRpYVRpbWUmLCBjb25zdCBQbGF0Zm9ybUF1ZGlv RGF0YSYsCiAKIGJvb2wgU3BlZWNoUmVjb2duaXplcjo6c3RhcnRSZWNvZ25pdGlvbihib29sLCBT cGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25DbGllbnRJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcm LCBib29sLCBib29sLCB1aW50NjRfdCkKIHsKKyAgICBtX2lzUmVjb2duaXppbmcgPSB0cnVlOwog ICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFNwZWVjaFJlY29nbml6ZXI6OmFib3J0UmVjb2du aXRpb24oKQogeworICAgIG1faXNSZWNvZ25pemluZyA9IGZhbHNlOwogICAgIG1fZGVsZWdhdGVD YWxsYmFjayhTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZTo6Y3JlYXRlKCptX2NsaWVudElkZW50aWZp ZXIsIFNwZWVjaFJlY29nbml0aW9uVXBkYXRlVHlwZTo6RW5kKSk7CiB9CiAKIHZvaWQgU3BlZWNo UmVjb2duaXplcjo6c3RvcFJlY29nbml0aW9uKCkKIHsKKyAgICBtX2lzUmVjb2duaXppbmcgPSBm YWxzZTsKICAgICBtX2RlbGVnYXRlQ2FsbGJhY2soU3BlZWNoUmVjb2duaXRpb25VcGRhdGU6OmNy ZWF0ZSgqbV9jbGllbnRJZGVudGlmaWVyLCBTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGU6OkVu ZCkpOwogfQogCiB2b2lkIFNwZWVjaFJlY29nbml6ZXI6OnJlc2V0UmVjb2duaXRpb24oKQogewor ICAgIGlmICghbV9pc1JlY29nbml6aW5nKQorICAgICAgICByZXR1cm47CiAgICAgYWJvcnRSZWNv Z25pdGlvbigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3NwZWVj aC9TcGVlY2hSZWNvZ25pemVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3NwZWVjaC9TcGVl Y2hSZWNvZ25pemVyLmgKaW5kZXggMzk2YTUzMTZhMGZmNWQxOTVmZDE5OTUxOTIzNGNmYjgxNWEw OGNhMy4uMTYwMmFmNzY2OWVjOWJkYjk1NDQxYzYyMzAyMDI0MWQxYzM0NDJlMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zcGVlY2gvU3BlZWNoUmVjb2duaXplci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3BlZWNoL1NwZWVjaFJlY29nbml6ZXIuaApAQCAtNzMs NiArNzMsOSBAQCBwcml2YXRlOgogCiAjaWYgSEFWRShTUEVFQ0hSRUNPR05JWkVSKQogICAgIFJl dGFpblB0cjxXZWJTcGVlY2hSZWNvZ25pemVyVGFzaz4gbV90YXNrOworI2Vsc2UKKyAgICAvLyBG b3IgdGVzdGluZy4KKyAgICBib29sIG1faXNSZWNvZ25pemluZyB7IGZhbHNlIH07CiAjZW5kaWYK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0 aW9uU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9u U2VydmVyLmNwcAppbmRleCA5NWY0ZGYyMGRkYjFlMjc5NmI0Yjk2YWNhYmFhNzY0ZmM4ZGY4NjNi Li5mNjMxZTNjODY4NDAzZjkwNmE3OGNhZWM2OTkwMDk4NDY0N2I4OWVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuY3BwCkBAIC0x NjcsMjAgKzE2Nyw2IEBAIHZvaWQgU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXI6OmludmFsaWRhdGUo V2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25Db25uZWN0aW9uQ2xpCiAgICAgfQogfQogCi12b2lk IFNwZWVjaFJlY29nbml0aW9uU2VydmVyOjphYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxl KCkKLXsKLSAgICBpZiAoIW1fcmVjb2duaXplcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0 byBjdXJyZW50Q2xpZW50SWRlbnRpZmllciA9IG1fcmVjb2duaXplci0+Y3VycmVudENsaWVudElk ZW50aWZpZXIoKTsKLSAgICBpZiAoIWN1cnJlbnRDbGllbnRJZGVudGlmaWVyKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBhdXRvIGVycm9yID0gV2ViQ29yZTo6U3BlZWNoUmVjb2duaXRpb25FcnJv ciB7IFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uRXJyb3JUeXBlOjpBYm9ydGVkLCAiUGFnZSBp cyBubyBsb25nZXIgdmlzaWJsZSJfcyB9OwotICAgIHNlbmRVcGRhdGUoKmN1cnJlbnRDbGllbnRJ ZGVudGlmaWVyLCBXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvblVwZGF0ZVR5cGU6OkVycm9yLCBl cnJvcik7Ci0gICAgbV9yZWNvZ25pemVyLT5yZXNldCgpOwotfQotCiB2b2lkIFNwZWVjaFJlY29n bml0aW9uU2VydmVyOjpzZW5kVXBkYXRlKFdlYkNvcmU6OlNwZWVjaFJlY29nbml0aW9uQ29ubmVj dGlvbkNsaWVudElkZW50aWZpZXIgY2xpZW50SWRlbnRpZmllciwgV2ViQ29yZTo6U3BlZWNoUmVj b2duaXRpb25VcGRhdGVUeXBlIHR5cGUsIE9wdGlvbmFsPFdlYkNvcmU6OlNwZWVjaFJlY29nbml0 aW9uRXJyb3I+IGVycm9yLCBPcHRpb25hbDxWZWN0b3I8V2ViQ29yZTo6U3BlZWNoUmVjb2duaXRp b25SZXN1bHREYXRhPj4gcmVzdWx0KQogewogICAgIGF1dG8gdXBkYXRlID0gV2ViQ29yZTo6U3Bl ZWNoUmVjb2duaXRpb25VcGRhdGU6OmNyZWF0ZShjbGllbnRJZGVudGlmaWVyLCB0eXBlKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVy LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TcGVlY2hSZWNvZ25pdGlvblNlcnZlci5oCmlu ZGV4IGMzN2Y4OTJmNTc0YWU0ZmRkZDhlNjQ2NGRlMmQyOGRhOWQ3ZDNlNjAuLmVjYmE0MDcwOTQw MzhiMzk3NjU1ZWNiMDE4ZGMyMTdkYmFhMWFiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1NwZWVjaFJlY29nbml0aW9uU2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvU3BlZWNoUmVjb2duaXRpb25TZXJ2ZXIuaApAQCAtNjMsNyArNjMsNiBAQCBwdWJs aWM6CiAgICAgdm9pZCBhYm9ydChXZWJDb3JlOjpTcGVlY2hSZWNvZ25pdGlvbkNvbm5lY3Rpb25D bGllbnRJZGVudGlmaWVyKTsKICAgICB2b2lkIGludmFsaWRhdGUoV2ViQ29yZTo6U3BlZWNoUmVj b2duaXRpb25Db25uZWN0aW9uQ2xpZW50SWRlbnRpZmllcik7CiAgICAgdm9pZCBtdXRlKCk7Ci0g ICAgdm9pZCBhYm9ydEZvclBhZ2VJc0JlY29taW5nSW52aXNpYmxlKCk7CiAKIHByaXZhdGU6CiAg ICAgdm9pZCByZXF1ZXN0UGVybWlzc2lvbkZvclJlcXVlc3QoV2ViQ29yZTo6U3BlZWNoUmVjb2du aXRpb25SZXF1ZXN0Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAppbmRleCA5YWVlNWY3YzEzMDgwZTBiYzZhZTkzOGMzMDBhZDg0NThlZWNmMzc5Li4yNjc3 ZWNkNzE2ZjNmNzNmZGI3MmQ3M2ExYTk5MjlmZTkxYjZjYzYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTE3OTAsOCArMTc5MCwxMyBAQCB2b2lk IFdlYlByb2Nlc3NQcm94eTo6cGFnZU11dGVkU3RhdGVDaGFuZ2VkKFdlYkNvcmU6OlBhZ2VJZGVu dGlmaWVyIGlkZW50aWZpZXIsCiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwYWdlSXNCZWNvbWlu Z0ludmlzaWJsZShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBpZGVudGlmaWVyKQogewotICAgIGlm IChhdXRvIHNlcnZlciA9IG1fc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXJNYXAuZ2V0KGlkZW50aWZp ZXIpKQotICAgICAgICBzZXJ2ZXItPmFib3J0Rm9yUGFnZUlzQmVjb21pbmdJbnZpc2libGUoKTsK KyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIGlmICghUmVhbHRpbWVNZWRpYVNvdXJjZUNl bnRlcjo6c2hvdWxkSW50ZXJydXB0QXVkaW9PblBhZ2VWaXNpYmlsaXR5Q2hhbmdlKCkpCisgICAg ICAgIHJldHVybjsKKyNlbmRpZgorCisgICAgaWYgKGF1dG8gc3BlZWNoUmVjb2duaXRpb25TZXJ2 ZXIgPSBtX3NwZWVjaFJlY29nbml0aW9uU2VydmVyTWFwLmdldChpZGVudGlmaWVyKSkKKyAgICAg ICAgc3BlZWNoUmVjb2duaXRpb25TZXJ2ZXItPm11dGUoKTsKIH0KIAogI2lmIFBMQVRGT1JNKFdB VENIT1MpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggYTkwZjUwYTAyZjVjNmJjNTBmNDQxYTYwOGUzOGYzZjdjNzc4MjM2Ni4uYzNkYzY2MTQ3YzM3 ZmVmM2U3N2I0NDZjNjNkYmM5ZTdmNDk5YTdjMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI2ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgTXV0ZSBhdWRpbyBjYXB0dXJl IGZvciBzcGVlY2ggcmVjb2duaXRpb24gYmFzZWQgb24gc2hvdWxkSW50ZXJydXB0QXVkaW9PblBh Z2VWaXNpYmlsaXR5Q2hhbmdlIHdoZW4gcGFnZSBpcyBpbnZpc2libGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk2MAorCisgICAgICAgIFJldmll d2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hy ZWNvZ25pdGlvbi1iYXNpYy5odG1sOgorCiAyMDIxLTAxLTI2ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHBvc2UgdGhlIHZhbHVlIG9mIGA8bWV0YSBuYW1l PSJ0aGVtZS1jb2xvciIgY29udGVudD0iLi4uIj5gIGFzIFNQSQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbSBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0K aW5kZXggN2JiZTg3MjhjMTUzYTBmNDRjYzZhMDdiNTdjMmZlYmY4OTA2ZTBiMy4uMzhhYjE3NWQx ZmQzMTA5M2M0ODMyNzA2YTJiODA4ODFjODdlZGM4YiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbQorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCkBA IC0yMDMsNyArMjAzLDcgQEAgVEVTVChXZWJLaXQyLCBTcGVlY2hSZWNvZ25pdGlvbkVycm9yV2hl blN0YXJ0aW5nQXVkaW9DYXB0dXJlT25EaWZmZXJlbnRQYWdlKQogICAgIEVYUEVDVF9XS19TVFJF UShAIkF1ZGlvIE11dGUiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCi0vLyBGSVhN RTogZW5hYmxlIHRoaXMgdGVzdCBvbiBpT1Mgd2hlbiBodHRwczovL3dlYmtpdC5vcmcvYi8xNzUy MDQgaXMgZml4ZWQuCisvLyBGSVhNRTogdGVzdCB0aGlzIG9uIGlPUyB3aGVuIGh0dHBzOi8vd2Vi a2l0Lm9yZy9iLzE3NTIwNCBpcyBmaXhlZC4KICNpZiBQTEFURk9STShNQUMpCiAKIFRFU1QoV2Vi S2l0MiwgU3BlZWNoUmVjb2duaXRpb25QYWdlQmVjb21lc0ludmlzaWJsZSkKQEAgLTIyMiwxOSAr MjIyLDE5IEBAIFRFU1QoV2ViS2l0MiwgU3BlZWNoUmVjb2duaXRpb25QYWdlQmVjb21lc0ludmlz aWJsZSkKICAgICBzaG91bGRHcmFudFBlcm1pc3Npb25SZXF1ZXN0ID0gdHJ1ZTsKICAgICByZWNl aXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9h ZFRlc3RQYWdlTmFtZWQ6QCJzcGVlY2hyZWNvZ25pdGlvbi1iYXNpYyJdOwotICAgIFt3ZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzdGFydCgpIl07CisgICAgW3dlYlZpZXcg ZXZhbHVhdGVKYXZhU2NyaXB0OkAic2V0U2hvdWxkSGFuZGxlRW5kRXZlbnQodHJ1ZSk7IHN0YXJ0 KCk7IiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJTdGFydCIs IFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiAKICAgICAvLyBIaWRlIHBhZ2UuCiAgICAgcmVj ZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7Ci0jaWYgUExBVEZPUk0oTUFDKQogICAgIFt3ZWJW aWV3LmdldCgpLndpbmRvdyBzZXRJc1Zpc2libGU6Tk9dOwotI2Vsc2UKLSAgICB3ZWJWaWV3Lmdl dCgpLndpbmRvdy5oaWRkZW4gPSBZRVM7Ci0jZW5kaWYKKyAgICBVdGlsOjpzbGVlcCgwLjEpOwor ICAgIC8vIE9uZ29pbmcgcmVjb2duaXRpb24gZG9lcyBub3Qgc3RvcCBhdXRvbWF0aWNhbGx5Lgor ICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOworICAgIFt3ZWJWaWV3IHN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzdG9wKCkiXTsKICAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVR KEAiRXJyb3I6IGFib3J0ZWQgLSBQYWdlIGlzIG5vIGxvbmdlciB2aXNpYmxlIiwgW2xhc3RTY3Jp cHRNZXNzYWdlIGJvZHldKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJFbmQiLCBbbGFzdFNjcmlw dE1lc3NhZ2UgYm9keV0pOwogCiAgICAgLy8gUGFnZSBpcyBpbnZpc2libGUuCiAgICAgcmVjZWl2 ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0 bWwKaW5kZXggYzY3ZDBjNzEwNjJiOWM0MTZhZjgxYWYyZjhlMjFkNjlmYjQwNjMzMy4uYzkzYTg0 MzZiOWUwODc0OGIyZTU3NGYzNzA4OGY0Yzk4ZGY4ZjFhYSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1s CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Evc3BlZWNocmVjb2du aXRpb24tYmFzaWMuaHRtbApAQCAtNiw2ICs2LDEyIEBACiAKIHZhciBzcGVlY2hSZWNvZ25pdGlv biA9IG51bGw7CiB2YXIgcmVjb3JkZXIgPSBudWxsOwordmFyIHNob3VsZEhhbmRsZUVuZEV2ZW50 ID0gZmFsc2U7CisKK2Z1bmN0aW9uIHNldFNob3VsZEhhbmRsZUVuZEV2ZW50KHNob3VsZEhhbmRs ZUV2ZW50KQoreworICAgIHNob3VsZEhhbmRsZUVuZEV2ZW50ID0gc2hvdWxkSGFuZGxlRXZlbnQ7 Cit9CiAKIGZ1bmN0aW9uIHN0YXJ0KCkKIHsKQEAgLTE0LDYgKzIwLDggQEAgZnVuY3Rpb24gc3Rh cnQoKQogICAgIHNwZWVjaFJlY29nbml0aW9uLmNvbnRpbnVvdXMgPSB0cnVlOwogICAgIHNwZWVj aFJlY29nbml0aW9uLm9uc3RhcnQgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVy cy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiU3RhcnQiKTsKICAgICBzcGVlY2hSZWNvZ25pdGlv bi5vbmVycm9yID0gKGV2ZW50KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0 SGFuZGxlci5wb3N0TWVzc2FnZSgiRXJyb3I6ICIgKyBldmVudC5lcnJvciArICIgLSAiICsgIGV2 ZW50Lm1lc3NhZ2UpOworICAgIGlmIChzaG91bGRIYW5kbGVFbmRFdmVudCkKKyAgICAgICAgc3Bl ZWNoUmVjb2duaXRpb24ub25lbmQgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVy cy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiRW5kIik7CiAKICAgICBzcGVlY2hSZWNvZ25pdGlv bi5zdGFydCgpOwogfQo=