234274 2021-12-13 14:33:54 -0800 REGRESSION (r286936): Many webstorage layout tests have become flaky failures 2021-12-15 11:43:55 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ryanhaddad sihui_liu cdumez sihui_liu webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1823771 0 ryanhaddad 2021-12-13 14:33:54 -0800 Many webstorage tests have become flaky failures after https://trac.webkit.org/changeset/286936/webkit imported/w3c/web-platform-tests/webstorage/event_basic.html imported/w3c/web-platform-tests/webstorage/event_body_attribute.html imported/w3c/web-platform-tests/webstorage/event_no_duplicates.html imported/w3c/web-platform-tests/webstorage/event_session_key.html imported/w3c/web-platform-tests/webstorage/event_session_newvalue.html imported/w3c/web-platform-tests/webstorage/event_session_oldvalue.html imported/w3c/web-platform-tests/webstorage/event_session_removeitem.html imported/w3c/web-platform-tests/webstorage/event_session_storagearea.html imported/w3c/web-platform-tests/webstorage/event_session_url.html imported/w3c/web-platform-tests/webstorage/event_setattribute.html --- /Volumes/Data/worker/catalina-debug-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/webstorage/event_session_key-expected.txt +++ /Volumes/Data/worker/catalina-debug-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/webstorage/event_session_key-actual.txt @@ -1,5 +1,7 @@ event_session_key -PASS key property test of session event - Session event is fired due to an invocation of the setItem(), clear() methods. +Harness Error (TIMEOUT), message = null +TIMEOUT key property test of session event - Session event is fired due to an invocation of the setItem(), clear() methods. Test timed out + https://results.webkit.org/?suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_body_attribute.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_no_duplicates.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_key.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_newvalue.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_oldvalue.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_removeitem.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_storagearea.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_session_url.html&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebstorage%2Fevent_setattribute.html&test=storage%2Ffilesystemaccess%2Fsync-access-handle-read-write-worker.html 1823774 1 webkit-bug-importer 2021-12-13 14:34:48 -0800 <rdar://problem/86434478> 1823840 2 447085 sihui_liu 2021-12-13 16:46:14 -0800 Created attachment 447085 Patch 1823841 3 447086 sihui_liu 2021-12-13 16:46:55 -0800 Created attachment 447086 Patch 1824017 4 447137 sihui_liu 2021-12-14 09:05:56 -0800 Created attachment 447137 Patch 1824102 5 447154 sihui_liu 2021-12-14 13:47:39 -0800 Created attachment 447154 Patch 1824390 6 447154 cdumez 2021-12-15 09:40:35 -0800 Comment on attachment 447154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447154&action=review > Source/WebKit/NetworkProcess/storage/SessionStorageManager.cpp:102 > + ASSERT(storageArea); This looks a little risky. 1824394 7 447154 sihui_liu 2021-12-15 09:47:32 -0800 Comment on attachment 447154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447154&action=review >> Source/WebKit/NetworkProcess/storage/SessionStorageManager.cpp:102 >> + ASSERT(storageArea); > > This looks a little risky. Will change to early return to match old behavior. 1824426 8 447256 sihui_liu 2021-12-15 10:43:47 -0800 Created attachment 447256 Patch for landing 1824427 9 447257 sihui_liu 2021-12-15 10:47:14 -0800 Created attachment 447257 Patch for landing 1824453 10 ews-feeder 2021-12-15 11:43:52 -0800 Committed r287090 (245282@main): <https://commits.webkit.org/245282@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447257. 447085 2021-12-13 16:46:14 -0800 2021-12-13 16:46:53 -0800 Patch bug-234274-20211213164613.patch text/plain 2429 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExMTc3NTA3MWUyNDg5NDU4 NmQ3MmM0MzQ4YWVhYjhhNzE1NDdlNzQuLjE0Zjg3ZjE2OGYzMzIzNjJlYjRkMTJkYzgxZGRiNGNm YjUwMzRhNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMTItMTMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBh ZGRlZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBh cmUgbm90IGRpc3BhdGNoZWQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2Vzc2lvblN0b3JhZ2VNYW5hZ2VyOjpjb25uZWN0VG9T ZXNzaW9uU3RvcmFnZUFyZWEpOgorCiAyMDIxLTEyLTEzICBKb29uZ2h1biBQYXJrICA8amg3MTgu cGFya0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggYnVpbGQgZXJyb3Ig c2luY2UgcjI4Njk0Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNDBmZDc5NjBh YzVkYjY3NjU5ZTJkNzM5MTdkZjI2YjRjMDczZmQzMS4uZjJiMmQxYmU2NDM2ZjA3NDBmOTBmNmYy MDVhMTgwZjk4YzE1Yzk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTc2LDEz ICs3NiwxNSBAQCBTdG9yYWdlQXJlYUlkZW50aWZpZXIgU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyOjph ZGRTdG9yYWdlQXJlYShzdGQ6OnVuaXF1ZV9wdHI8TWVtbwogU3RvcmFnZUFyZWFJZGVudGlmaWVy IFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6Y29ubmVjdFRvU2Vzc2lvblN0b3JhZ2VBcmVhKElQQzo6 Q29ubmVjdGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvbiwgY29uc3QgV2ViQ29yZTo6Q2xpZW50T3Jp Z2luJiBvcmlnaW4sIFN0b3JhZ2VOYW1lc3BhY2VJZGVudGlmaWVyIG5hbWVzcGFjZUlkZW50aWZp ZXIpCiB7CiAgICAgYXV0byBpZGVudGlmaWVyID0gbV9zdG9yYWdlQXJlYXNCeU5hbWVzcGFjZS5n ZXQobmFtZXNwYWNlSWRlbnRpZmllcik7Ci0gICAgaWYgKGlkZW50aWZpZXIuaXNWYWxpZCgpKSB7 Ci0gICAgICAgIEFTU0VSVChtX3N0b3JhZ2VBcmVhcy5jb250YWlucyhpZGVudGlmaWVyKSk7Ci0g ICAgICAgIHJldHVybiBpZGVudGlmaWVyOworICAgIGlmICghaWRlbnRpZmllci5pc1ZhbGlkKCkp IHsKKyAgICAgICAgYXV0byBuZXdTdG9yYWdlQXJlYSA9IG1ha2VVbmlxdWU8TWVtb3J5U3RvcmFn ZUFyZWE+KG9yaWdpbik7CisgICAgICAgIHJldHVybiBhZGRTdG9yYWdlQXJlYShXVEZNb3ZlKG5l d1N0b3JhZ2VBcmVhKSwgY29ubmVjdGlvbiwgbmFtZXNwYWNlSWRlbnRpZmllcik7CiAgICAgfQog Ci0gICAgYXV0byBuZXdTdG9yYWdlQXJlYSA9IG1ha2VVbmlxdWU8TWVtb3J5U3RvcmFnZUFyZWE+ KG9yaWdpbik7Ci0gICAgcmV0dXJuIGFkZFN0b3JhZ2VBcmVhKFdURk1vdmUobmV3U3RvcmFnZUFy ZWEpLCBjb25uZWN0aW9uLCBuYW1lc3BhY2VJZGVudGlmaWVyKTsKKyAgICBhdXRvIHN0b3JhZ2VB cmVhID0gbV9zdG9yYWdlQXJlYXMuZ2V0KGlkZW50aWZpZXIpOworICAgIEFTU0VSVChzdG9yYWdl QXJlYSk7CisgICAgc3RvcmFnZUFyZWEtPmFkZExpc3RlbmVyKGNvbm5lY3Rpb24pOworICAgIHJl dHVybiBpZGVudGlmaWVyOwogfQogCiB2b2lkIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6ZGlzY29u bmVjdEZyb21TdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlEIGNvbm5lY3Rpb24s IFN0b3JhZ2VBcmVhSWRlbnRpZmllciBpZGVudGlmaWVyKQo= 447086 2021-12-13 16:46:55 -0800 2021-12-14 09:05:53 -0800 Patch bug-234274-20211213164654.patch text/plain 2391 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExMTc3NTA3MWUyNDg5NDU4 NmQ3MmM0MzQ4YWVhYjhhNzE1NDdlNzQuLmU2NTljM2NlNTQ0MTdjZmMyMWRjZjFiZTVlMGU5YjM0 ZjVkYjYxNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTItMTMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBh ZGRlZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBh cmUgbm90IGRpc3BhdGNoZWQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nl c3Npb25TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9yYWdl TWFuYWdlcjo6Y29ubmVjdFRvU2Vzc2lvblN0b3JhZ2VBcmVhKToKKwogMjAyMS0xMi0xMyAgSm9v bmdodW4gUGFyayAgPGpoNzE4LnBhcmtAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZC4gRml4IGJ1aWxkIGVycm9yIHNpbmNlIHIyODY5NDYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIu Y3BwCmluZGV4IDQwZmQ3OTYwYWM1ZGI2NzY1OWUyZDczOTE3ZGYyNmI0YzA3M2ZkMzEuLmYyYjJk MWJlNjQzNmYwNzQwZjkwZjZmMjA1YTE4MGY5OGMxNWM5NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1h bmFnZXIuY3BwCkBAIC03NiwxMyArNzYsMTUgQEAgU3RvcmFnZUFyZWFJZGVudGlmaWVyIFNlc3Np b25TdG9yYWdlTWFuYWdlcjo6YWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW8KIFN0 b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmNvbm5lY3RUb1Nlc3Np b25TdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlEIGNvbm5lY3Rpb24sIGNvbnN0 IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYgb3JpZ2luLCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmll ciBuYW1lc3BhY2VJZGVudGlmaWVyKQogewogICAgIGF1dG8gaWRlbnRpZmllciA9IG1fc3RvcmFn ZUFyZWFzQnlOYW1lc3BhY2UuZ2V0KG5hbWVzcGFjZUlkZW50aWZpZXIpOwotICAgIGlmIChpZGVu dGlmaWVyLmlzVmFsaWQoKSkgewotICAgICAgICBBU1NFUlQobV9zdG9yYWdlQXJlYXMuY29udGFp bnMoaWRlbnRpZmllcikpOwotICAgICAgICByZXR1cm4gaWRlbnRpZmllcjsKKyAgICBpZiAoIWlk ZW50aWZpZXIuaXNWYWxpZCgpKSB7CisgICAgICAgIGF1dG8gbmV3U3RvcmFnZUFyZWEgPSBtYWtl VW5pcXVlPE1lbW9yeVN0b3JhZ2VBcmVhPihvcmlnaW4pOworICAgICAgICByZXR1cm4gYWRkU3Rv cmFnZUFyZWEoV1RGTW92ZShuZXdTdG9yYWdlQXJlYSksIGNvbm5lY3Rpb24sIG5hbWVzcGFjZUlk ZW50aWZpZXIpOwogICAgIH0KIAotICAgIGF1dG8gbmV3U3RvcmFnZUFyZWEgPSBtYWtlVW5pcXVl PE1lbW9yeVN0b3JhZ2VBcmVhPihvcmlnaW4pOwotICAgIHJldHVybiBhZGRTdG9yYWdlQXJlYShX VEZNb3ZlKG5ld1N0b3JhZ2VBcmVhKSwgY29ubmVjdGlvbiwgbmFtZXNwYWNlSWRlbnRpZmllcik7 CisgICAgYXV0byBzdG9yYWdlQXJlYSA9IG1fc3RvcmFnZUFyZWFzLmdldChpZGVudGlmaWVyKTsK KyAgICBBU1NFUlQoc3RvcmFnZUFyZWEpOworICAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0ZW5lcihj b25uZWN0aW9uKTsKKyAgICByZXR1cm4gaWRlbnRpZmllcjsKIH0KIAogdm9pZCBTZXNzaW9uU3Rv cmFnZU1hbmFnZXI6OmRpc2Nvbm5lY3RGcm9tU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uOjpV bmlxdWVJRCBjb25uZWN0aW9uLCBTdG9yYWdlQXJlYUlkZW50aWZpZXIgaWRlbnRpZmllcikK 447137 2021-12-14 09:05:56 -0800 2021-12-14 13:47:36 -0800 Patch bug-234274-20211214090555.patch text/plain 6527 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZhOGUxMjg1Yzk3YzNjNjA4 MDljOGMxY2E4NDhhZjViZmI1ZGY5MjkuLmQ3NTAxMjI0ZmQyZTM5OTU4ZjQ0MGJkM2M0Njg4NjNl OTEyMTg2Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMTItMTQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBh ZGRlZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBh cmUgbm90IGRpc3BhdGNoZWQuCisgICAgICAgIEFsc28gYWNjb3JkaW5nIHRvIHRoZSBvbGQgYmVo YXZpb3IsIHdlIGRvbid0IGFkZCBjb25uZWN0aW9uIChsaXN0ZW5lcikgdG8gU3RvcmFnZUFyZWEg d2hlbiBjcmVhdGluZyBpdCwgYnV0IHdoZW4KKyAgICAgICAgdGhlcmUgaXMgYSBjb25uZWN0aW9u VG8qIG1lc3NhZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25T dG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9yYWdlTWFuYWdl cjo6YWRkU3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uU3RvcmFnZU1hbmFn ZXI6OmNvbm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlNlc3Np b25TdG9yYWdlTWFuYWdlcjo6Y2xvbmVTdG9yYWdlQXJlYSk6CisgICAgICAgICogTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaDoKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL1N0b3JhZ2VBcmVhQmFzZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0 b3JhZ2VBcmVhQmFzZTo6aGFzTGlzdGVuZXIgY29uc3QpOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL3N0b3JhZ2UvU3RvcmFnZUFyZWFCYXNlLmg6CisKIDIwMjEtMTItMTMgIENvbW1pdCBRdWV1 ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVy dGluZyByMjg2OTkzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA0MGZkNzk2MGFj NWRiNjc2NTllMmQ3MzkxN2RmMjZiNGMwNzNmZDMxLi45M2Q2MTQzZDU2OTM2ZGIxMDhmMWQ2OTBk NzQ3MTc5NWJlMDA0YjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNjIsMTEg KzYyLDEwIEBAIHZvaWQgU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyOjpjb25uZWN0aW9uQ2xvc2VkKElQ Qzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvCiAgICAgICAgIHN0b3JhZ2VBcmVhLT5y ZW1vdmVMaXN0ZW5lcihjb25uZWN0aW9uKTsKIH0KIAotU3RvcmFnZUFyZWFJZGVudGlmaWVyIFNl c3Npb25TdG9yYWdlTWFuYWdlcjo6YWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW9y eVN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYSwgSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCBjb25u ZWN0aW9uLCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllciBuYW1lc3BhY2VJZGVudGlmaWVyKQor U3RvcmFnZUFyZWFJZGVudGlmaWVyIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRkU3RvcmFnZUFy ZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW9yeVN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYSwgU3RvcmFn ZU5hbWVzcGFjZUlkZW50aWZpZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKIHsKICAgICBhdXRvIGlk ZW50aWZpZXIgPSBzdG9yYWdlQXJlYS0+aWRlbnRpZmllcigpOwogICAgIG1fcmVnaXN0cnkucmVn aXN0ZXJTdG9yYWdlQXJlYShpZGVudGlmaWVyLCAqc3RvcmFnZUFyZWEpOwotICAgIHN0b3JhZ2VB cmVhLT5hZGRMaXN0ZW5lcihjb25uZWN0aW9uKTsKICAgICBtX3N0b3JhZ2VBcmVhc0J5TmFtZXNw YWNlLmFkZChuYW1lc3BhY2VJZGVudGlmaWVyLCBpZGVudGlmaWVyKTsKICAgICBtX3N0b3JhZ2VB cmVhcy5hZGQoaWRlbnRpZmllciwgV1RGTW92ZShzdG9yYWdlQXJlYSkpOwogCkBAIC03NiwxMyAr NzUsMTUgQEAgU3RvcmFnZUFyZWFJZGVudGlmaWVyIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRk U3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW8KIFN0b3JhZ2VBcmVhSWRlbnRpZmllciBT ZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmNvbm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYShJUEM6OkNv bm5lY3Rpb246OlVuaXF1ZUlEIGNvbm5lY3Rpb24sIGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdp biYgb3JpZ2luLCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllciBuYW1lc3BhY2VJZGVudGlmaWVy KQogewogICAgIGF1dG8gaWRlbnRpZmllciA9IG1fc3RvcmFnZUFyZWFzQnlOYW1lc3BhY2UuZ2V0 KG5hbWVzcGFjZUlkZW50aWZpZXIpOwotICAgIGlmIChpZGVudGlmaWVyLmlzVmFsaWQoKSkgewot ICAgICAgICBBU1NFUlQobV9zdG9yYWdlQXJlYXMuY29udGFpbnMoaWRlbnRpZmllcikpOwotICAg ICAgICByZXR1cm4gaWRlbnRpZmllcjsKKyAgICBpZiAoIWlkZW50aWZpZXIuaXNWYWxpZCgpKSB7 CisgICAgICAgIGF1dG8gbmV3U3RvcmFnZUFyZWEgPSBtYWtlVW5pcXVlPE1lbW9yeVN0b3JhZ2VB cmVhPihvcmlnaW4pOworICAgICAgICBpZGVudGlmaWVyID0gYWRkU3RvcmFnZUFyZWEoV1RGTW92 ZShuZXdTdG9yYWdlQXJlYSksIG5hbWVzcGFjZUlkZW50aWZpZXIpOwogICAgIH0KIAotICAgIGF1 dG8gbmV3U3RvcmFnZUFyZWEgPSBtYWtlVW5pcXVlPE1lbW9yeVN0b3JhZ2VBcmVhPihvcmlnaW4p OwotICAgIHJldHVybiBhZGRTdG9yYWdlQXJlYShXVEZNb3ZlKG5ld1N0b3JhZ2VBcmVhKSwgY29u bmVjdGlvbiwgbmFtZXNwYWNlSWRlbnRpZmllcik7CisgICAgYXV0byBzdG9yYWdlQXJlYSA9IG1f c3RvcmFnZUFyZWFzLmdldChpZGVudGlmaWVyKTsKKyAgICBBU1NFUlQoc3RvcmFnZUFyZWEpOwor ICAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0ZW5lcihjb25uZWN0aW9uKTsKKyAgICByZXR1cm4gaWRl bnRpZmllcjsKIH0KIAogdm9pZCBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmRpc2Nvbm5lY3RGcm9t U3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCBjb25uZWN0aW9uLCBTdG9yYWdl QXJlYUlkZW50aWZpZXIgaWRlbnRpZmllcikKQEAgLTk3LDEwICs5OCwxMCBAQCB2b2lkIFNlc3Np b25TdG9yYWdlTWFuYWdlcjo6Y2xvbmVTdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVuaXF1 ZUlEIGNvbm5lY3RpbwogICAgIGlmICghaWRlbnRpZmllci5pc1ZhbGlkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmIChhdXRvIGl0ZXJhdG9yID0gbV9zdG9yYWdlQXJlYXMuZmluZChpZGVu dGlmaWVyKTsgaXRlcmF0b3IgIT0gbV9zdG9yYWdlQXJlYXMuZW5kKCkpIHsKLSAgICAgICAgYXV0 byBuZXdTdG9yYWdlQXJlYSA9IGl0ZXJhdG9yLT52YWx1ZS0+Y2xvbmUoKTsKLSAgICAgICAgYWRk U3RvcmFnZUFyZWEoV1RGTW92ZShuZXdTdG9yYWdlQXJlYSksIGNvbm5lY3Rpb24sIHRhcmdldE5h bWVzcGFjZUlkZW50aWZpZXIpOwotICAgIH0KKyAgICBhdXRvIHN0b3JhZ2VBcmVhID0gbV9zdG9y YWdlQXJlYXMuZ2V0KGlkZW50aWZpZXIpOworICAgIEFTU0VSVChzdG9yYWdlQXJlYSk7CisgICAg QVNTRVJUKHN0b3JhZ2VBcmVhLT5oYXNMaXN0ZW5lcihjb25uZWN0aW9uKSk7CisgICAgYWRkU3Rv cmFnZUFyZWEoc3RvcmFnZUFyZWEtPmNsb25lKCksIHRhcmdldE5hbWVzcGFjZUlkZW50aWZpZXIp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaAppbmRl eCAzMzZjNDY0NTY5NzYzNmQ4MjhmMDVmYzg0ZmJjMDRhZThlNzk5NjdlLi5mYzE3NjFiZTkwMGY4 ZTRkYTc3NTRiMDE4ZjFkYmUyZTM4ZmI3ZGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmgKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5oCkBA IC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsb25lU3RvcmFnZUFyZWEoSVBDOjpD b25uZWN0aW9uOjpVbmlxdWVJRCwgU3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIsIFN0b3JhZ2VO YW1lc3BhY2VJZGVudGlmaWVyKTsKIAogcHJpdmF0ZToKLSAgICBTdG9yYWdlQXJlYUlkZW50aWZp ZXIgYWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW9yeVN0b3JhZ2VBcmVhPiwgSVBD OjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgU3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIpOworICAg IFN0b3JhZ2VBcmVhSWRlbnRpZmllciBhZGRTdG9yYWdlQXJlYShzdGQ6OnVuaXF1ZV9wdHI8TWVt b3J5U3RvcmFnZUFyZWE+LCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllcik7CiAKICAgICBTdG9y YWdlQXJlYVJlZ2lzdHJ5JiBtX3JlZ2lzdHJ5OwogICAgIEhhc2hNYXA8U3RvcmFnZUFyZWFJZGVu dGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8TWVtb3J5U3RvcmFnZUFyZWE+PiBtX3N0b3JhZ2VBcmVh czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TdG9y YWdlQXJlYUJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0 b3JhZ2VBcmVhQmFzZS5jcHAKaW5kZXggZTQ0YmEwMTM1YTY0M2MwMWE1YjkwMGM3NjMxYmExNDk5 OGY4ZjNjMS4uMjY4NWYyMmRkY2RiZjcwMDJhOWQ2MDY2OGU3ZjBjMzkyYzc4Mjk3MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0b3JhZ2VBcmVhQmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0b3JhZ2VB cmVhQmFzZS5jcHAKQEAgLTU2LDYgKzU2LDExIEBAIGJvb2wgU3RvcmFnZUFyZWFCYXNlOjpoYXNM aXN0ZW5lcnMoKSBjb25zdAogICAgIHJldHVybiAhbV9saXN0ZW5lcnMuaXNFbXB0eSgpOwogfQog Citib29sIFN0b3JhZ2VBcmVhQmFzZTo6aGFzTGlzdGVuZXIoSVBDOjpDb25uZWN0aW9uOjpVbmlx dWVJRCBjb25uZWN0aW9uKSBjb25zdAoreworICAgIHJldHVybiBtX2xpc3RlbmVycy5jb250YWlu cyhjb25uZWN0aW9uKTsKK30KKwogdm9pZCBTdG9yYWdlQXJlYUJhc2U6Om5vdGlmeUxpc3RlbmVy c0Fib3V0Q2xlYXIoKQogewogICAgIGZvciAoYXV0byYgY29ubmVjdGlvbiA6IG1fbGlzdGVuZXJz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0b3Jh Z2VBcmVhQmFzZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0b3Jh Z2VBcmVhQmFzZS5oCmluZGV4IGVkM2VkMTQyMDZlMTc1ZGNhY2M4YzFmOTk0OTA3NTA1NDVlMzRl OTguLjczYjc0NWY1MmY4YjE2ZTVlYmNhN2E3YzExZjY1MTBhNzk1ODhjZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TdG9yYWdlQXJlYUJhc2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU3RvcmFnZUFyZWFCYXNl LmgKQEAgLTYyLDYgKzYyLDcgQEAgcHVibGljOgogICAgIHZvaWQgYWRkTGlzdGVuZXIoSVBDOjpD b25uZWN0aW9uOjpVbmlxdWVJRCk7CiAgICAgdm9pZCByZW1vdmVMaXN0ZW5lcihJUEM6OkNvbm5l Y3Rpb246OlVuaXF1ZUlEKTsKICAgICBib29sIGhhc0xpc3RlbmVycygpIGNvbnN0OworICAgIGJv b2wgaGFzTGlzdGVuZXIoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCkgY29uc3Q7CiAgICAgdm9p ZCBub3RpZnlMaXN0ZW5lcnNBYm91dENsZWFyKCk7CiAKICAgICB2aXJ0dWFsIEhhc2hNYXA8U3Ry aW5nLCBTdHJpbmc+IGFsbEl0ZW1zKCkgPSAwOwo= 447154 2021-12-14 13:47:39 -0800 2021-12-15 10:43:44 -0800 Patch bug-234274-20211214134738.patch text/plain 5006 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczNWUzMjY0MjkwMWU1YjY5 MjA0ZGQ5NzUxZGE3NmU5YWVmYWU2ZDkuLjc0YTRmNmQ0Yzg1OGJkZDNhNzZhMTFlM2NkNTliY2I2 MGFjNDA3NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTItMTQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBh ZGRlZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBh cmUgbm90IGRpc3BhdGNoZWQuCisgICAgICAgIEFsc28gYWNjb3JkaW5nIHRvIHRoZSBvbGQgYmVo YXZpb3IsIHdlIGRvbid0IGFkZCBjb25uZWN0aW9uIChsaXN0ZW5lcikgdG8gU3RvcmFnZUFyZWEg d2hlbiBjcmVhdGluZyBpdCwgYnV0IHdoZW4KKyAgICAgICAgdGhlcmUgaXMgYSBjb25uZWN0aW9u IG1lc3NhZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9y YWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9yYWdlTWFuYWdlcjo6 YWRkU3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uU3RvcmFnZU1hbmFnZXI6 OmNvbm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25T dG9yYWdlTWFuYWdlcjo6Y2xvbmVTdG9yYWdlQXJlYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAyMS0xMi0xNCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBfV0tD b250ZW50UnVsZUxpc3RBY3Rpb24ucmVkaXJlY3RlZCBhbmQgLm1vZGlmaWVkSGVhZGVycwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9y YWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vz c2lvblN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA0MGZkNzk2MGFjNWRiNjc2NTllMmQ3MzkxN2Rm MjZiNGMwNzNmZDMxLi5kNGUyNDVmMTA1Y2M3YWI2NWU0Yjc3NTkxZGViMTZjZTRmMDk4ZTdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0 b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3Jh Z2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNjIsMTEgKzYyLDEwIEBAIHZvaWQgU2Vz c2lvblN0b3JhZ2VNYW5hZ2VyOjpjb25uZWN0aW9uQ2xvc2VkKElQQzo6Q29ubmVjdGlvbjo6VW5p cXVlSUQgY29ubmVjdGlvCiAgICAgICAgIHN0b3JhZ2VBcmVhLT5yZW1vdmVMaXN0ZW5lcihjb25u ZWN0aW9uKTsKIH0KIAotU3RvcmFnZUFyZWFJZGVudGlmaWVyIFNlc3Npb25TdG9yYWdlTWFuYWdl cjo6YWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW9yeVN0b3JhZ2VBcmVhPiBzdG9y YWdlQXJlYSwgSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCBjb25uZWN0aW9uLCBTdG9yYWdlTmFt ZXNwYWNlSWRlbnRpZmllciBuYW1lc3BhY2VJZGVudGlmaWVyKQorU3RvcmFnZUFyZWFJZGVudGlm aWVyIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRy PE1lbW9yeVN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYSwgU3RvcmFnZU5hbWVzcGFjZUlkZW50aWZp ZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKIHsKICAgICBhdXRvIGlkZW50aWZpZXIgPSBzdG9yYWdl QXJlYS0+aWRlbnRpZmllcigpOwogICAgIG1fcmVnaXN0cnkucmVnaXN0ZXJTdG9yYWdlQXJlYShp ZGVudGlmaWVyLCAqc3RvcmFnZUFyZWEpOwotICAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0ZW5lcihj b25uZWN0aW9uKTsKICAgICBtX3N0b3JhZ2VBcmVhc0J5TmFtZXNwYWNlLmFkZChuYW1lc3BhY2VJ ZGVudGlmaWVyLCBpZGVudGlmaWVyKTsKICAgICBtX3N0b3JhZ2VBcmVhcy5hZGQoaWRlbnRpZmll ciwgV1RGTW92ZShzdG9yYWdlQXJlYSkpOwogCkBAIC03NiwxMyArNzUsMTUgQEAgU3RvcmFnZUFy ZWFJZGVudGlmaWVyIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRkU3RvcmFnZUFyZWEoc3RkOjp1 bmlxdWVfcHRyPE1lbW8KIFN0b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFn ZXI6OmNvbm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlE IGNvbm5lY3Rpb24sIGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYgb3JpZ2luLCBTdG9yYWdl TmFtZXNwYWNlSWRlbnRpZmllciBuYW1lc3BhY2VJZGVudGlmaWVyKQogewogICAgIGF1dG8gaWRl bnRpZmllciA9IG1fc3RvcmFnZUFyZWFzQnlOYW1lc3BhY2UuZ2V0KG5hbWVzcGFjZUlkZW50aWZp ZXIpOwotICAgIGlmIChpZGVudGlmaWVyLmlzVmFsaWQoKSkgewotICAgICAgICBBU1NFUlQobV9z dG9yYWdlQXJlYXMuY29udGFpbnMoaWRlbnRpZmllcikpOwotICAgICAgICByZXR1cm4gaWRlbnRp ZmllcjsKKyAgICBpZiAoIWlkZW50aWZpZXIuaXNWYWxpZCgpKSB7CisgICAgICAgIGF1dG8gbmV3 U3RvcmFnZUFyZWEgPSBtYWtlVW5pcXVlPE1lbW9yeVN0b3JhZ2VBcmVhPihvcmlnaW4pOworICAg ICAgICBpZGVudGlmaWVyID0gYWRkU3RvcmFnZUFyZWEoV1RGTW92ZShuZXdTdG9yYWdlQXJlYSks IG5hbWVzcGFjZUlkZW50aWZpZXIpOwogICAgIH0KIAotICAgIGF1dG8gbmV3U3RvcmFnZUFyZWEg PSBtYWtlVW5pcXVlPE1lbW9yeVN0b3JhZ2VBcmVhPihvcmlnaW4pOwotICAgIHJldHVybiBhZGRT dG9yYWdlQXJlYShXVEZNb3ZlKG5ld1N0b3JhZ2VBcmVhKSwgY29ubmVjdGlvbiwgbmFtZXNwYWNl SWRlbnRpZmllcik7CisgICAgYXV0byBzdG9yYWdlQXJlYSA9IG1fc3RvcmFnZUFyZWFzLmdldChp ZGVudGlmaWVyKTsKKyAgICBBU1NFUlQoc3RvcmFnZUFyZWEpOworICAgIHN0b3JhZ2VBcmVhLT5h ZGRMaXN0ZW5lcihjb25uZWN0aW9uKTsKKyAgICByZXR1cm4gaWRlbnRpZmllcjsKIH0KIAogdm9p ZCBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmRpc2Nvbm5lY3RGcm9tU3RvcmFnZUFyZWEoSVBDOjpD b25uZWN0aW9uOjpVbmlxdWVJRCBjb25uZWN0aW9uLCBTdG9yYWdlQXJlYUlkZW50aWZpZXIgaWRl bnRpZmllcikKQEAgLTk3LDEwICs5OCw5IEBAIHZvaWQgU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyOjpj bG9uZVN0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvCiAgICAg aWYgKCFpZGVudGlmaWVyLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGF1 dG8gaXRlcmF0b3IgPSBtX3N0b3JhZ2VBcmVhcy5maW5kKGlkZW50aWZpZXIpOyBpdGVyYXRvciAh PSBtX3N0b3JhZ2VBcmVhcy5lbmQoKSkgewotICAgICAgICBhdXRvIG5ld1N0b3JhZ2VBcmVhID0g aXRlcmF0b3ItPnZhbHVlLT5jbG9uZSgpOwotICAgICAgICBhZGRTdG9yYWdlQXJlYShXVEZNb3Zl KG5ld1N0b3JhZ2VBcmVhKSwgY29ubmVjdGlvbiwgdGFyZ2V0TmFtZXNwYWNlSWRlbnRpZmllcik7 Ci0gICAgfQorICAgIGF1dG8gc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VBcmVhcy5nZXQoaWRlbnRp Zmllcik7CisgICAgQVNTRVJUKHN0b3JhZ2VBcmVhKTsKKyAgICBhZGRTdG9yYWdlQXJlYShzdG9y YWdlQXJlYS0+Y2xvbmUoKSwgdGFyZ2V0TmFtZXNwYWNlSWRlbnRpZmllcik7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5oCmluZGV4IDMzNmM0NjQ1Njk3 NjM2ZDgyOGYwNWZjODRmYmMwNGFlOGU3OTk2N2UuLmZjMTc2MWJlOTAwZjhlNGRhNzc1NGIwMThm MWRiZTJlMzhmYjdkZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLmgKQEAgLTUyLDcgKzUyLDcg QEAgcHVibGljOgogICAgIHZvaWQgY2xvbmVTdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVu aXF1ZUlELCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllciwgU3RvcmFnZU5hbWVzcGFjZUlkZW50 aWZpZXIpOwogCiBwcml2YXRlOgotICAgIFN0b3JhZ2VBcmVhSWRlbnRpZmllciBhZGRTdG9yYWdl QXJlYShzdGQ6OnVuaXF1ZV9wdHI8TWVtb3J5U3RvcmFnZUFyZWE+LCBJUEM6OkNvbm5lY3Rpb246 OlVuaXF1ZUlELCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllcik7CisgICAgU3RvcmFnZUFyZWFJ ZGVudGlmaWVyIGFkZFN0b3JhZ2VBcmVhKHN0ZDo6dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdlQXJl YT4sIFN0b3JhZ2VOYW1lc3BhY2VJZGVudGlmaWVyKTsKIAogICAgIFN0b3JhZ2VBcmVhUmVnaXN0 cnkmIG1fcmVnaXN0cnk7CiAgICAgSGFzaE1hcDxTdG9yYWdlQXJlYUlkZW50aWZpZXIsIHN0ZDo6 dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdlQXJlYT4+IG1fc3RvcmFnZUFyZWFzOwo= 447256 2021-12-15 10:43:47 -0800 2021-12-15 10:47:12 -0800 Patch for landing bug-234274-20211215104346.patch text/plain 5040 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhY2EwYzhmMGZjYjcwYjZj MGFhN2IyNWY5OTBiYjc2NWM5NTUxOGEuLmVjODA1NTRlNDNiN2U0YzhjZWU2OGE4ZmNkOWU1OTVi YzFjYTY5MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTItMTUgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRHVtZXouCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBhZGRl ZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBhcmUg bm90IGRpc3BhdGNoZWQuCisgICAgICAgIEFsc28gYWNjb3JkaW5nIHRvIHRoZSBvbGQgYmVoYXZp b3IsIHdlIGRvbid0IGFkZCBjb25uZWN0aW9uIChsaXN0ZW5lcikgdG8gU3RvcmFnZUFyZWEgd2hl biBjcmVhdGluZyBpdCwgYnV0IHdoZW4KKyAgICAgICAgdGhlcmUgaXMgYSBjb25uZWN0aW9uIG1l c3NhZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdl TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRk U3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmNv bm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9y YWdlTWFuYWdlcjo6Y2xvbmVTdG9yYWdlQXJlYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAyMS0xMi0xNSAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3RlQXVkaW9NZWRpYVN0cmVh bVRyYWNrUmVuZGVyZXJJbnRlcm5hbFVuaXRNYW5hZ2VyOjpVbml0IHNob3VsZCBvbmx5IHJlc2V0 IG9uY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9T ZXNzaW9uU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNDBmZDc5NjBhYzVkYjY3NjU5 ZTJkNzM5MTdkZjI2YjRjMDczZmQzMS4uYWRhZTVjY2M4NGFkYzFiY2M5OTgyMTMyMWZkNjQyZDNl ZDlhN2EyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdl L1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTYyLDExICs2MiwxMCBA QCB2b2lkIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6Y29ubmVjdGlvbkNsb3NlZChJUEM6OkNvbm5l Y3Rpb246OlVuaXF1ZUlEIGNvbm5lY3RpbwogICAgICAgICBzdG9yYWdlQXJlYS0+cmVtb3ZlTGlz dGVuZXIoY29ubmVjdGlvbik7CiB9CiAKLVN0b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3Rv cmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VBcmVhKHN0ZDo6dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdl QXJlYT4gc3RvcmFnZUFyZWEsIElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvbiwg U3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKK1N0b3JhZ2VB cmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VBcmVhKHN0ZDo6 dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEsIFN0b3JhZ2VOYW1lc3Bh Y2VJZGVudGlmaWVyIG5hbWVzcGFjZUlkZW50aWZpZXIpCiB7CiAgICAgYXV0byBpZGVudGlmaWVy ID0gc3RvcmFnZUFyZWEtPmlkZW50aWZpZXIoKTsKICAgICBtX3JlZ2lzdHJ5LnJlZ2lzdGVyU3Rv cmFnZUFyZWEoaWRlbnRpZmllciwgKnN0b3JhZ2VBcmVhKTsKLSAgICBzdG9yYWdlQXJlYS0+YWRk TGlzdGVuZXIoY29ubmVjdGlvbik7CiAgICAgbV9zdG9yYWdlQXJlYXNCeU5hbWVzcGFjZS5hZGQo bmFtZXNwYWNlSWRlbnRpZmllciwgaWRlbnRpZmllcik7CiAgICAgbV9zdG9yYWdlQXJlYXMuYWRk KGlkZW50aWZpZXIsIFdURk1vdmUoc3RvcmFnZUFyZWEpKTsKIApAQCAtNzYsMTMgKzc1LDE3IEBA IFN0b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VB cmVhKHN0ZDo6dW5pcXVlX3B0cjxNZW1vCiBTdG9yYWdlQXJlYUlkZW50aWZpZXIgU2Vzc2lvblN0 b3JhZ2VNYW5hZ2VyOjpjb25uZWN0VG9TZXNzaW9uU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9u OjpVbmlxdWVJRCBjb25uZWN0aW9uLCBjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mIG9yaWdp biwgU3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKIHsKICAg ICBhdXRvIGlkZW50aWZpZXIgPSBtX3N0b3JhZ2VBcmVhc0J5TmFtZXNwYWNlLmdldChuYW1lc3Bh Y2VJZGVudGlmaWVyKTsKLSAgICBpZiAoaWRlbnRpZmllci5pc1ZhbGlkKCkpIHsKLSAgICAgICAg QVNTRVJUKG1fc3RvcmFnZUFyZWFzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKLSAgICAgICAgcmV0 dXJuIGlkZW50aWZpZXI7CisgICAgaWYgKCFpZGVudGlmaWVyLmlzVmFsaWQoKSkgeworICAgICAg ICBhdXRvIG5ld1N0b3JhZ2VBcmVhID0gbWFrZVVuaXF1ZTxNZW1vcnlTdG9yYWdlQXJlYT4ob3Jp Z2luKTsKKyAgICAgICAgaWRlbnRpZmllciA9IGFkZFN0b3JhZ2VBcmVhKFdURk1vdmUobmV3U3Rv cmFnZUFyZWEpLCBuYW1lc3BhY2VJZGVudGlmaWVyKTsKICAgICB9CiAKLSAgICBhdXRvIG5ld1N0 b3JhZ2VBcmVhID0gbWFrZVVuaXF1ZTxNZW1vcnlTdG9yYWdlQXJlYT4ob3JpZ2luKTsKLSAgICBy ZXR1cm4gYWRkU3RvcmFnZUFyZWEoV1RGTW92ZShuZXdTdG9yYWdlQXJlYSksIGNvbm5lY3Rpb24s IG5hbWVzcGFjZUlkZW50aWZpZXIpOworICAgIGF1dG8gc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VB cmVhcy5nZXQoaWRlbnRpZmllcik7CisgICAgaWYgKCFzdG9yYWdlQXJlYSkKKyAgICAgICAgcmV0 dXJuIFN0b3JhZ2VBcmVhSWRlbnRpZmllciB7IH07CisKKyAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0 ZW5lcihjb25uZWN0aW9uKTsKKyAgICByZXR1cm4gaWRlbnRpZmllcjsKIH0KIAogdm9pZCBTZXNz aW9uU3RvcmFnZU1hbmFnZXI6OmRpc2Nvbm5lY3RGcm9tU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0 aW9uOjpVbmlxdWVJRCBjb25uZWN0aW9uLCBTdG9yYWdlQXJlYUlkZW50aWZpZXIgaWRlbnRpZmll cikKQEAgLTk3LDEwICsxMDAsOCBAQCB2b2lkIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6Y2xvbmVT dG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlEIGNvbm5lY3RpbwogICAgIGlmICgh aWRlbnRpZmllci5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChhdXRvIGl0 ZXJhdG9yID0gbV9zdG9yYWdlQXJlYXMuZmluZChpZGVudGlmaWVyKTsgaXRlcmF0b3IgIT0gbV9z dG9yYWdlQXJlYXMuZW5kKCkpIHsKLSAgICAgICAgYXV0byBuZXdTdG9yYWdlQXJlYSA9IGl0ZXJh dG9yLT52YWx1ZS0+Y2xvbmUoKTsKLSAgICAgICAgYWRkU3RvcmFnZUFyZWEoV1RGTW92ZShuZXdT dG9yYWdlQXJlYSksIGNvbm5lY3Rpb24sIHRhcmdldE5hbWVzcGFjZUlkZW50aWZpZXIpOwotICAg IH0KKyAgICBpZiAoYXV0byBzdG9yYWdlQXJlYSA9IG1fc3RvcmFnZUFyZWFzLmdldChpZGVudGlm aWVyKSkKKyAgICAgICAgYWRkU3RvcmFnZUFyZWEoc3RvcmFnZUFyZWEtPmNsb25lKCksIHRhcmdl dE5hbWVzcGFjZUlkZW50aWZpZXIpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9uU3RvcmFn ZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNzaW9u U3RvcmFnZU1hbmFnZXIuaAppbmRleCAzMzZjNDY0NTY5NzYzNmQ4MjhmMDVmYzg0ZmJjMDRhZThl Nzk5NjdlLi5mYzE3NjFiZTkwMGY4ZTRkYTc3NTRiMDE4ZjFkYmUyZTM4ZmI3ZGZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3JhZ2VN YW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Np b25TdG9yYWdlTWFuYWdlci5oCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNs b25lU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgU3RvcmFnZU5hbWVzcGFj ZUlkZW50aWZpZXIsIFN0b3JhZ2VOYW1lc3BhY2VJZGVudGlmaWVyKTsKIAogcHJpdmF0ZToKLSAg ICBTdG9yYWdlQXJlYUlkZW50aWZpZXIgYWRkU3RvcmFnZUFyZWEoc3RkOjp1bmlxdWVfcHRyPE1l bW9yeVN0b3JhZ2VBcmVhPiwgSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgU3RvcmFnZU5hbWVz cGFjZUlkZW50aWZpZXIpOworICAgIFN0b3JhZ2VBcmVhSWRlbnRpZmllciBhZGRTdG9yYWdlQXJl YShzdGQ6OnVuaXF1ZV9wdHI8TWVtb3J5U3RvcmFnZUFyZWE+LCBTdG9yYWdlTmFtZXNwYWNlSWRl bnRpZmllcik7CiAKICAgICBTdG9yYWdlQXJlYVJlZ2lzdHJ5JiBtX3JlZ2lzdHJ5OwogICAgIEhh c2hNYXA8U3RvcmFnZUFyZWFJZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8TWVtb3J5U3RvcmFn ZUFyZWE+PiBtX3N0b3JhZ2VBcmVhczsK 447257 2021-12-15 10:47:14 -0800 2021-12-15 11:43:53 -0800 Patch for landing bug-234274-20211215104714.patch text/plain 5041 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhY2EwYzhmMGZjYjcwYjZj MGFhN2IyNWY5OTBiYjc2NWM5NTUxOGEuLmVjODA1NTRlNDNiN2U0YzhjZWU2OGE4ZmNkOWU1OTVi YzFjYTY5MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTItMTUgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjkzNik6 IE1hbnkgd2Vic3RvcmFnZSBsYXlvdXQgdGVzdHMgaGF2ZSBiZWNvbWUgZmxha3kgZmFpbHVyZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI3NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODY0MzQ0Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRHVtZXouCisKKyAgICAgICAgQ29ubmVjdGlvbiAobGlzdGVuZXIpIGlzIG5vdCBhZGRl ZCBwcm9wZXJseSB0byBleGlzdGluZyBNZW1vcnlTdG9yYWdlQXJlYXMsIHNvIGV2ZW50cyBhcmUg bm90IGRpc3BhdGNoZWQuCisgICAgICAgIEFsc28gYWNjb3JkaW5nIHRvIHRoZSBvbGQgYmVoYXZp b3IsIHdlIGRvbid0IGFkZCBjb25uZWN0aW9uIChsaXN0ZW5lcikgdG8gU3RvcmFnZUFyZWEgd2hl biBjcmVhdGluZyBpdCwgYnV0IHdoZW4KKyAgICAgICAgdGhlcmUgaXMgYSBjb25uZWN0aW9uIG1l c3NhZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdl TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9yYWdlTWFuYWdlcjo6YWRk U3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmNv bm5lY3RUb1Nlc3Npb25TdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TdG9y YWdlTWFuYWdlcjo6Y2xvbmVTdG9yYWdlQXJlYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9TZXNzaW9uU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAyMS0xMi0xNSAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3RlQXVkaW9NZWRpYVN0cmVh bVRyYWNrUmVuZGVyZXJJbnRlcm5hbFVuaXRNYW5hZ2VyOjpVbml0IHNob3VsZCBvbmx5IHJlc2V0 IG9uY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9T ZXNzaW9uU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNDBmZDc5NjBhYzVkYjY3NjU5 ZTJkNzM5MTdkZjI2YjRjMDczZmQzMS4uZDQwZTQwYjYxNzNjMjhkNDRjNTdiOGUyMGY3MmJjYjUx MTA0MWRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdl L1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTYyLDExICs2MiwxMCBA QCB2b2lkIFNlc3Npb25TdG9yYWdlTWFuYWdlcjo6Y29ubmVjdGlvbkNsb3NlZChJUEM6OkNvbm5l Y3Rpb246OlVuaXF1ZUlEIGNvbm5lY3RpbwogICAgICAgICBzdG9yYWdlQXJlYS0+cmVtb3ZlTGlz dGVuZXIoY29ubmVjdGlvbik7CiB9CiAKLVN0b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3Rv cmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VBcmVhKHN0ZDo6dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdl QXJlYT4gc3RvcmFnZUFyZWEsIElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvbiwg U3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKK1N0b3JhZ2VB cmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VBcmVhKHN0ZDo6 dW5pcXVlX3B0cjxNZW1vcnlTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEsIFN0b3JhZ2VOYW1lc3Bh Y2VJZGVudGlmaWVyIG5hbWVzcGFjZUlkZW50aWZpZXIpCiB7CiAgICAgYXV0byBpZGVudGlmaWVy ID0gc3RvcmFnZUFyZWEtPmlkZW50aWZpZXIoKTsKICAgICBtX3JlZ2lzdHJ5LnJlZ2lzdGVyU3Rv cmFnZUFyZWEoaWRlbnRpZmllciwgKnN0b3JhZ2VBcmVhKTsKLSAgICBzdG9yYWdlQXJlYS0+YWRk TGlzdGVuZXIoY29ubmVjdGlvbik7CiAgICAgbV9zdG9yYWdlQXJlYXNCeU5hbWVzcGFjZS5hZGQo bmFtZXNwYWNlSWRlbnRpZmllciwgaWRlbnRpZmllcik7CiAgICAgbV9zdG9yYWdlQXJlYXMuYWRk KGlkZW50aWZpZXIsIFdURk1vdmUoc3RvcmFnZUFyZWEpKTsKIApAQCAtNzYsMTMgKzc1LDE3IEBA IFN0b3JhZ2VBcmVhSWRlbnRpZmllciBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmFkZFN0b3JhZ2VB cmVhKHN0ZDo6dW5pcXVlX3B0cjxNZW1vCiBTdG9yYWdlQXJlYUlkZW50aWZpZXIgU2Vzc2lvblN0 b3JhZ2VNYW5hZ2VyOjpjb25uZWN0VG9TZXNzaW9uU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9u OjpVbmlxdWVJRCBjb25uZWN0aW9uLCBjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mIG9yaWdp biwgU3RvcmFnZU5hbWVzcGFjZUlkZW50aWZpZXIgbmFtZXNwYWNlSWRlbnRpZmllcikKIHsKICAg ICBhdXRvIGlkZW50aWZpZXIgPSBtX3N0b3JhZ2VBcmVhc0J5TmFtZXNwYWNlLmdldChuYW1lc3Bh Y2VJZGVudGlmaWVyKTsKLSAgICBpZiAoaWRlbnRpZmllci5pc1ZhbGlkKCkpIHsKLSAgICAgICAg QVNTRVJUKG1fc3RvcmFnZUFyZWFzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKLSAgICAgICAgcmV0 dXJuIGlkZW50aWZpZXI7CisgICAgaWYgKCFpZGVudGlmaWVyLmlzVmFsaWQoKSkgeworICAgICAg ICBhdXRvIG5ld1N0b3JhZ2VBcmVhID0gbWFrZVVuaXF1ZTxNZW1vcnlTdG9yYWdlQXJlYT4ob3Jp Z2luKTsKKyAgICAgICAgaWRlbnRpZmllciA9IGFkZFN0b3JhZ2VBcmVhKFdURk1vdmUobmV3U3Rv cmFnZUFyZWEpLCBuYW1lc3BhY2VJZGVudGlmaWVyKTsKICAgICB9CiAKLSAgICBhdXRvIG5ld1N0 b3JhZ2VBcmVhID0gbWFrZVVuaXF1ZTxNZW1vcnlTdG9yYWdlQXJlYT4ob3JpZ2luKTsKLSAgICBy ZXR1cm4gYWRkU3RvcmFnZUFyZWEoV1RGTW92ZShuZXdTdG9yYWdlQXJlYSksIGNvbm5lY3Rpb24s IG5hbWVzcGFjZUlkZW50aWZpZXIpOworICAgIGF1dG8gc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VB cmVhcy5nZXQoaWRlbnRpZmllcik7CisgICAgaWYgKCFzdG9yYWdlQXJlYSkKKyAgICAgICAgcmV0 dXJuIFN0b3JhZ2VBcmVhSWRlbnRpZmllciB7IH07CisKKyAgICBzdG9yYWdlQXJlYS0+YWRkTGlz dGVuZXIoY29ubmVjdGlvbik7CisgICAgcmV0dXJuIGlkZW50aWZpZXI7CiB9CiAKIHZvaWQgU2Vz c2lvblN0b3JhZ2VNYW5hZ2VyOjpkaXNjb25uZWN0RnJvbVN0b3JhZ2VBcmVhKElQQzo6Q29ubmVj dGlvbjo6VW5pcXVlSUQgY29ubmVjdGlvbiwgU3RvcmFnZUFyZWFJZGVudGlmaWVyIGlkZW50aWZp ZXIpCkBAIC05NywxMCArMTAwLDggQEAgdm9pZCBTZXNzaW9uU3RvcmFnZU1hbmFnZXI6OmNsb25l U3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCBjb25uZWN0aW8KICAgICBpZiAo IWlkZW50aWZpZXIuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoYXV0byBp dGVyYXRvciA9IG1fc3RvcmFnZUFyZWFzLmZpbmQoaWRlbnRpZmllcik7IGl0ZXJhdG9yICE9IG1f c3RvcmFnZUFyZWFzLmVuZCgpKSB7Ci0gICAgICAgIGF1dG8gbmV3U3RvcmFnZUFyZWEgPSBpdGVy YXRvci0+dmFsdWUtPmNsb25lKCk7Ci0gICAgICAgIGFkZFN0b3JhZ2VBcmVhKFdURk1vdmUobmV3 U3RvcmFnZUFyZWEpLCBjb25uZWN0aW9uLCB0YXJnZXROYW1lc3BhY2VJZGVudGlmaWVyKTsKLSAg ICB9CisgICAgaWYgKGF1dG8gc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VBcmVhcy5nZXQoaWRlbnRp ZmllcikpCisgICAgICAgIGFkZFN0b3JhZ2VBcmVhKHN0b3JhZ2VBcmVhLT5jbG9uZSgpLCB0YXJn ZXROYW1lc3BhY2VJZGVudGlmaWVyKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lvblN0b3Jh Z2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU2Vzc2lv blN0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggMzM2YzQ2NDU2OTc2MzZkODI4ZjA1ZmM4NGZiYzA0YWU4 ZTc5OTY3ZS4uZmMxNzYxYmU5MDBmOGU0ZGE3NzU0YjAxOGYxZGJlMmUzOGZiN2RmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1Nlc3Npb25TdG9yYWdl TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TZXNz aW9uU3RvcmFnZU1hbmFnZXIuaApAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBj bG9uZVN0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQsIFN0b3JhZ2VOYW1lc3Bh Y2VJZGVudGlmaWVyLCBTdG9yYWdlTmFtZXNwYWNlSWRlbnRpZmllcik7CiAKIHByaXZhdGU6Ci0g ICAgU3RvcmFnZUFyZWFJZGVudGlmaWVyIGFkZFN0b3JhZ2VBcmVhKHN0ZDo6dW5pcXVlX3B0cjxN ZW1vcnlTdG9yYWdlQXJlYT4sIElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQsIFN0b3JhZ2VOYW1l c3BhY2VJZGVudGlmaWVyKTsKKyAgICBTdG9yYWdlQXJlYUlkZW50aWZpZXIgYWRkU3RvcmFnZUFy ZWEoc3RkOjp1bmlxdWVfcHRyPE1lbW9yeVN0b3JhZ2VBcmVhPiwgU3RvcmFnZU5hbWVzcGFjZUlk ZW50aWZpZXIpOwogCiAgICAgU3RvcmFnZUFyZWFSZWdpc3RyeSYgbV9yZWdpc3RyeTsKICAgICBI YXNoTWFwPFN0b3JhZ2VBcmVhSWRlbnRpZmllciwgc3RkOjp1bmlxdWVfcHRyPE1lbW9yeVN0b3Jh Z2VBcmVhPj4gbV9zdG9yYWdlQXJlYXM7Cg==