209532 2020-03-24 22:58:33 -0700 IndexedDB: destroy UniqueIDBDatabase when it's not used 2020-03-30 12:23:11 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 209700 1 sihui_liu sihui_liu alecflett beidson commit-queue ews-watchlist ggaren jsbell webkit-bug-importer oldest_to_newest 1633791 0 sihui_liu 2020-03-24 22:58:33 -0700 If connections of a UniqueIDBDatabase are all closed and there is no pending request on the UniqueIDBDatabase, the UniqueIDBDatabase may not be used any more. 1633798 1 394473 sihui_liu 2020-03-24 23:22:54 -0700 Created attachment 394473 Patch 1633990 2 ggaren 2020-03-25 12:33:53 -0700 What's the motivation for this change? Can we test it somehow? 1634033 3 sihui_liu 2020-03-25 13:42:07 -0700 (In reply to Geoffrey Garen from comment #2) > What's the motivation for this change? > > Can we test it somehow? It is actually the old behavior before IDB background thread change. We don't want to keep the UniqueIDBDatabase objects in memory if they may never be used again. Current behavior is once UniqueIDBDatabase is created it will be in the map unless IDB data is deleted. I've tested the patch this manually. This should not cause any behavior change other than less memory in the case of opening a lot of IDBDatabase, closing them, and never using them again. 1634116 4 394473 ggaren 2020-03-25 16:32:37 -0700 Comment on attachment 394473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394473&action=review r=me > Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:1198 > +void UniqueIDBDatabase::destroyIfPossible() Does this function delete the UniqueIDBDatabase object, or just disconnect it from the server? I think a better name might be "tryRemoveFromServer" or "tryClose". 1634136 5 394473 sihui_liu 2020-03-25 17:56:18 -0700 Comment on attachment 394473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394473&action=review >> Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:1198 >> +void UniqueIDBDatabase::destroyIfPossible() > > Does this function delete the UniqueIDBDatabase object, or just disconnect it from the server? > > I think a better name might be "tryRemoveFromServer" or "tryClose". IDBServer owns UniqueIDBDatabase; this function deletes the object by removing it from the IDBServer. Will change the name to tryCloseAndRemoveFromServer. 1634219 6 394581 sihui_liu 2020-03-25 22:44:55 -0700 Created attachment 394581 Patch for landing 1634222 7 ews-feeder 2020-03-25 23:26:57 -0700 Committed r259034: <https://trac.webkit.org/changeset/259034> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394581. 1634223 8 webkit-bug-importer 2020-03-25 23:27:14 -0700 <rdar://problem/60906908> 1635164 9 commit-queue 2020-03-28 06:06:04 -0700 Re-opened since this is blocked by bug 209700 1635632 10 394943 sihui_liu 2020-03-30 11:51:55 -0700 Created attachment 394943 Patch for landing 1635644 11 ews-feeder 2020-03-30 12:23:11 -0700 Committed r259215: <https://trac.webkit.org/changeset/259215> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394943. 394473 2020-03-24 23:22:54 -0700 2020-03-25 22:44:53 -0700 Patch bug-209532-20200324232254.patch text/plain 5702 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTgyZDQ1Mzg1ZDQ2ZjJi YTdiMmNiYmVhMTkwZTljMjg5YjdmZjFkZS4uYTc5MDZiNzIwNzdiNTIyNGNjMGU5ZmZmYjFhZDYz ZTk0MWNhNDY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAzLTI0ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEluZGV4ZWREQjogZGVzdHJv eSBVbmlxdWVJREJEYXRhYmFzZSB3aGVuIGl0J3Mgbm90IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTUzMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gYWxsIGNvbm5lY3Rpb25zIG9mIGEg VW5pcXVlSURCRGF0YWJhc2Ugb2JqZWN0IGFyZSBjbG9zZWQgYW5kIHRoZXJlIGFyZSBubyBwZW5k aW5nIHJldXFlc3RzLCB0aGUgCisgICAgICAgIFVuaXF1ZUlEQkRhdGFiYXNlIG1heSBub3QgYmUg dXNlZCBhbnkgbW9yZS4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJT ZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI6OnJlbW92 ZVVuaXF1ZUlEQkRhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2Vy dmVyOjpjbG9zZUFuZFRha2VVbmlxdWVJREJEYXRhYmFzZSk6IERlbGV0ZWQuCisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5oOgorICAgICAgICAqIE1vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpoYW5kbGVEZWxldGUpOgorICAgICAgICAo V2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6Y29ubmVjdGlvbkNsb3NlZEZy b21DbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFz ZTo6ZGVzdHJveUlmUG9zc2libGUpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9VbmlxdWVJREJEYXRhYmFzZS5oOgorCiAyMDIwLTAzLTI0ICBBbmRyZXMgR29uemFsZXogIDxh bmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCBtdWx0aXBsZSB1bm5lY2Vzc2Fy eSB1cGRhdGVzIG9mIHRoZSBJc29sYXRlZFRyZWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwCmluZGV4IGZhMWNhNjY5YTU1 NTQyNDVmMjM3OTAwYjU4ZGE1ZDM1OTc1NjQ2MjYuLjQ4OGExMDgwMTE4ZTI0OGI4ZDkzMWFlMzVh YzQ5MTQyM2YzN2YwZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwCkBAIC0xNzEsMTUgKzE3MSwxMyBAQCB2b2lkIElE QlNlcnZlcjo6ZGVsZXRlRGF0YWJhc2UoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVlc3REYXRh KQogICAgIGRhdGFiYXNlLT5oYW5kbGVEZWxldGUoKmNvbm5lY3Rpb24sIHJlcXVlc3REYXRhKTsK IH0KIAotc3RkOjp1bmlxdWVfcHRyPFVuaXF1ZUlEQkRhdGFiYXNlPiBJREJTZXJ2ZXI6OmNsb3Nl QW5kVGFrZVVuaXF1ZUlEQkRhdGFiYXNlKFVuaXF1ZUlEQkRhdGFiYXNlJiBkYXRhYmFzZSkKK3Zv aWQgSURCU2VydmVyOjpyZW1vdmVVbmlxdWVJREJEYXRhYmFzZShjb25zdCBJREJEYXRhYmFzZUlk ZW50aWZpZXImIGlkZW50aWZpZXIpCiB7Ci0gICAgTE9HKEluZGV4ZWREQiwgIklEQlNlcnZlcjo6 Y2xvc2VVbmlxdWVJREJEYXRhYmFzZSIpOwotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0K LSAgICBhdXRvIHVuaXF1ZVBvaW50ZXIgPSBtX3VuaXF1ZUlEQkRhdGFiYXNlTWFwLnRha2UoZGF0 YWJhc2UuaWRlbnRpZmllcigpKTsKLSAgICBBU1NFUlQodW5pcXVlUG9pbnRlcik7CisgICAgTE9H KEluZGV4ZWREQiwgIklEQlNlcnZlcjo6cmVtb3ZlVW5pcXVlSURCRGF0YWJhc2UiKTsKKyAgICBB U1NFUlQoIWlzTWFpblRocmVhZCgpKTsKIAotICAgIHJldHVybiB1bmlxdWVQb2ludGVyOworICAg IGF1dG8gcmVtb3ZlZCA9IG1fdW5pcXVlSURCRGF0YWJhc2VNYXAucmVtb3ZlKGlkZW50aWZpZXIp OworICAgIEFTU0VSVF9VTlVTRUQocmVtb3ZlZCwgcmVtb3ZlZCk7CiB9CiAKIHZvaWQgSURCU2Vy dmVyOjphYm9ydFRyYW5zYWN0aW9uKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNh Y3Rpb25JZGVudGlmaWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL0lEQlNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvc2VydmVyL0lEQlNlcnZlci5oCmluZGV4IDQwOTg3NDlmNTc4N2IwNzljN2ExZWVhODQxOGU2 MTI5OGU3N2RjYmQuLjU2MTZiMDUzZDVjNTZjNWFmMjI1ZjA4NDMyYTE1Y2NjOTdkZDNhMmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2 ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2Vy dmVyLmgKQEAgLTk2LDcgKzk2LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVnaXN0ZXJUcmFuc2Fj dGlvbihVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJik7CiAgICAgdm9pZCB1bnJlZ2lzdGVy VHJhbnNhY3Rpb24oVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbiYpOwogCi0gICAgc3RkOjp1 bmlxdWVfcHRyPFVuaXF1ZUlEQkRhdGFiYXNlPiBjbG9zZUFuZFRha2VVbmlxdWVJREJEYXRhYmFz ZShVbmlxdWVJREJEYXRhYmFzZSYpOworICAgIHZvaWQgcmVtb3ZlVW5pcXVlSURCRGF0YWJhc2Uo Y29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJik7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SURC QmFja2luZ1N0b3JlPiBjcmVhdGVCYWNraW5nU3RvcmUoY29uc3QgSURCRGF0YWJhc2VJZGVudGlm aWVyJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCmluZGV4IGJlNmIxMzI0MDAyOTdmZjQ2 YjM1NDJmOWE1NzcyNzU3YmE1MzdhODEuLmYxYjNjYzM4YzAyZDIyMWE5MTgzN2JjOTk1Y2I4MTIz ZTYyMDQwODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAtMzc5LDYgKzM3OSw4IEBA IHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmhhbmRsZURlbGV0ZShJREJDb25uZWN0aW9uVG9DbGll bnQmIGNvbm5lY3Rpb24sIGNvbnN0IElECiAKICAgICBtX3BlbmRpbmdPcGVuREJSZXF1ZXN0cy5h ZGQoU2VydmVyT3BlbkRCUmVxdWVzdDo6Y3JlYXRlKGNvbm5lY3Rpb24sIHJlcXVlc3REYXRhKSk7 CiAgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRpb25zKCk7CisKKyAgICBkZXN0cm95SWZQb3NzaWJs ZSgpOwogfQogCiB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpzdGFydFZlcnNpb25DaGFuZ2VUcmFu c2FjdGlvbigpCkBAIC05NDYsNiArOTQ4LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y29u bmVjdGlvbkNsb3NlZEZyb21DbGllbnQoVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uJgogICAg ICAgICAgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRpb25zKCk7CiAgICAgICAgICAgICBoYW5kbGVU cmFuc2FjdGlvbnMoKTsKIAorICAgICAgICAgICAgZGVzdHJveUlmUG9zc2libGUoKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTk2MSw2ICs5NjQsOCBAQCB2b2lk IFVuaXF1ZUlEQkRhdGFiYXNlOjpjb25uZWN0aW9uQ2xvc2VkRnJvbUNsaWVudChVbmlxdWVJREJE YXRhYmFzZUNvbm5lY3Rpb24mCiAgICAgLy8gTm93IHRoYXQgYSBkYXRhYmFzZSBjb25uZWN0aW9u IGhhcyBjbG9zZWQsIHByZXZpb3VzbHkgYmxvY2tlZCBvcGVyYXRpb25zIG1pZ2h0IGJlIHJ1bm5h YmxlLgogICAgIGhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucygpOwogICAgIGhhbmRsZVRyYW5zYWN0 aW9ucygpOworCisgICAgZGVzdHJveUlmUG9zc2libGUoKTsKIH0KIAogdm9pZCBVbmlxdWVJREJE YXRhYmFzZTo6Y29ubmVjdGlvbkNsb3NlZEZyb21TZXJ2ZXIoVW5pcXVlSURCRGF0YWJhc2VDb25u ZWN0aW9uJiBjb25uZWN0aW9uKQpAQCAtMTE5MCw2ICsxMTk1LDE4IEBAIHZvaWQgVW5pcXVlSURC RGF0YWJhc2U6OmNsb3NlKCkKICAgICB9CiB9CiAKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmRl c3Ryb3lJZlBvc3NpYmxlKCkKK3sKKyAgICBpZiAobV9iYWNraW5nU3RvcmUgJiYgbV9iYWNraW5n U3RvcmUtPmlzRXBoZW1lcmFsKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChoYXNBbnlP cGVuQ29ubmVjdGlvbnMoKSB8fCBtX3ZlcnNpb25DaGFuZ2VEYXRhYmFzZUNvbm5lY3Rpb24pCisg ICAgICAgIHJldHVybjsKKworICAgIGNsb3NlKCk7CisgICAgbV9zZXJ2ZXIucmVtb3ZlVW5pcXVl SURCRGF0YWJhc2UobV9pZGVudGlmaWVyKTsKK30KKwogUmVmUHRyPFNlcnZlck9wZW5EQlJlcXVl c3Q+IFVuaXF1ZUlEQkRhdGFiYXNlOjp0YWtlTmV4dFJ1bm5hYmxlUmVxdWVzdChSZXF1ZXN0VHlw ZSByZXF1ZXN0VHlwZSkKIHsKICAgICAvLyBDb25uZWN0aW9uIG9mIHJlcXVlc3QgbWF5IGJlIGNs b3NlZCBvciBsb3N0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaAppbmRleCAxYzY4ODczNTA2MDI2ZWZk ZWZhMGQ3Mjc5M2NlOGNhMmM3NGM0NDk5Li4zYTcwMmUzMDM2ZDRiY2M3OWVmMzU5ZDNhM2NiZTMy YWVlYjZjYTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaApAQCAtMTM2LDYgKzEzNiw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBkZWxldGVCYWNraW5nU3RvcmUoKTsKICAgICB2b2lkIGRpZERlbGV0 ZUJhY2tpbmdTdG9yZSh1aW50NjRfdCBkZWxldGVkVmVyc2lvbik7CiAgICAgdm9pZCBjbG9zZSgp OworICAgIHZvaWQgZGVzdHJveUlmUG9zc2libGUoKTsKIAogICAgIGJvb2wgaXNDdXJyZW50bHlJ blVzZSgpIGNvbnN0OwogICAgIHZvaWQgY2xlYXJTdGFsZVBlbmRpbmdPcGVuREJSZXF1ZXN0cygp Owo= 394581 2020-03-25 22:44:55 -0700 2020-03-30 11:51:54 -0700 Patch for landing bug-209532-20200325224454.patch text/plain 5851 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYxMjA5NjFiNGVkY2I5 MzFlOTgwMWYwNDllYWU4NzU0YThlYzZjMy4uNDJmNTc0ZGYwYWU2NTFiNDc2ZWYwMDFlNjBjMjc2 MmE5YTAyYzZlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAzLTI1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEluZGV4ZWREQjogZGVzdHJv eSBVbmlxdWVJREJEYXRhYmFzZSB3aGVuIGl0J3Mgbm90IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTUzMgorCisgICAgICAgIFJldmlld2Vk IGJ5IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVu LgorCisgICAgICAgIFdoZW4gYWxsIGNvbm5lY3Rpb25zIG9mIGEgVW5pcXVlSURCRGF0YWJhc2Ug b2JqZWN0IGFyZSBjbG9zZWQgYW5kIHRoZXJlIGFyZSBubyBwZW5kaW5nIHJldXFlc3RzLCB0aGUg CisgICAgICAgIG9iamVjdCBtYXkgbm90IGJlIHVzZWQgYW55IG1vcmUuIFdlIHNob3VsZCBkZWxl dGUgaXQgZm9yIGJldHRlciBtZW1vcnkgdXNlLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVk ZGIvc2VydmVyL0lEQlNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklE QlNlcnZlcjo6cmVtb3ZlVW5pcXVlSURCRGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6SURC U2VydmVyOjpJREJTZXJ2ZXI6OmNsb3NlQW5kVGFrZVVuaXF1ZUlEQkRhdGFiYXNlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmg6CisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OmhhbmRsZURlbGV0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpjb25u ZWN0aW9uQ2xvc2VkRnJvbUNsaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVu aXF1ZUlEQkRhdGFiYXNlOjp0cnlDbG9zZUFuZFJlbW92ZUZyb21TZXJ2ZXIpOgorICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oOgorCiAyMDIwLTAz LTI1ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAg ICAgWyBtYWNPUyBdIHN2Zy9jdXN0b20vdGV4dFBhdGgtY2hhbmdlLWlkLXBhdHRlcm4uc3ZnIGlz IGZsYWtleSBmYWlsaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwCmluZGV4IGZhMWNhNjY5YTU1NTQyNDVmMjM3OTAwYjU4 ZGE1ZDM1OTc1NjQ2MjYuLjQ4OGExMDgwMTE4ZTI0OGI4ZDkzMWFlMzVhYzQ5MTQyM2YzN2YwZTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJT ZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9J REJTZXJ2ZXIuY3BwCkBAIC0xNzEsMTUgKzE3MSwxMyBAQCB2b2lkIElEQlNlcnZlcjo6ZGVsZXRl RGF0YWJhc2UoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVlc3REYXRhKQogICAgIGRhdGFiYXNl LT5oYW5kbGVEZWxldGUoKmNvbm5lY3Rpb24sIHJlcXVlc3REYXRhKTsKIH0KIAotc3RkOjp1bmlx dWVfcHRyPFVuaXF1ZUlEQkRhdGFiYXNlPiBJREJTZXJ2ZXI6OmNsb3NlQW5kVGFrZVVuaXF1ZUlE QkRhdGFiYXNlKFVuaXF1ZUlEQkRhdGFiYXNlJiBkYXRhYmFzZSkKK3ZvaWQgSURCU2VydmVyOjpy ZW1vdmVVbmlxdWVJREJEYXRhYmFzZShjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImIGlkZW50 aWZpZXIpCiB7Ci0gICAgTE9HKEluZGV4ZWREQiwgIklEQlNlcnZlcjo6Y2xvc2VVbmlxdWVJREJE YXRhYmFzZSIpOwotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0KLSAgICBhdXRvIHVuaXF1 ZVBvaW50ZXIgPSBtX3VuaXF1ZUlEQkRhdGFiYXNlTWFwLnRha2UoZGF0YWJhc2UuaWRlbnRpZmll cigpKTsKLSAgICBBU1NFUlQodW5pcXVlUG9pbnRlcik7CisgICAgTE9HKEluZGV4ZWREQiwgIklE QlNlcnZlcjo6cmVtb3ZlVW5pcXVlSURCRGF0YWJhc2UiKTsKKyAgICBBU1NFUlQoIWlzTWFpblRo cmVhZCgpKTsKIAotICAgIHJldHVybiB1bmlxdWVQb2ludGVyOworICAgIGF1dG8gcmVtb3ZlZCA9 IG1fdW5pcXVlSURCRGF0YWJhc2VNYXAucmVtb3ZlKGlkZW50aWZpZXIpOworICAgIEFTU0VSVF9V TlVTRUQocmVtb3ZlZCwgcmVtb3ZlZCk7CiB9CiAKIHZvaWQgSURCU2VydmVyOjphYm9ydFRyYW5z YWN0aW9uKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVy KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lE QlNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNl cnZlci5oCmluZGV4IDQwOTg3NDlmNTc4N2IwNzljN2ExZWVhODQxOGU2MTI5OGU3N2RjYmQuLjU2 MTZiMDUzZDVjNTZjNWFmMjI1ZjA4NDMyYTE1Y2NjOTdkZDNhMmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmgKQEAgLTk2LDcg Kzk2LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVnaXN0ZXJUcmFuc2FjdGlvbihVbmlxdWVJREJE YXRhYmFzZVRyYW5zYWN0aW9uJik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyVHJhbnNhY3Rpb24oVW5p cXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbiYpOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPFVuaXF1 ZUlEQkRhdGFiYXNlPiBjbG9zZUFuZFRha2VVbmlxdWVJREJEYXRhYmFzZShVbmlxdWVJREJEYXRh YmFzZSYpOworICAgIHZvaWQgcmVtb3ZlVW5pcXVlSURCRGF0YWJhc2UoY29uc3QgSURCRGF0YWJh c2VJZGVudGlmaWVyJik7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SURCQmFja2luZ1N0b3JlPiBj cmVhdGVCYWNraW5nU3RvcmUoY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJik7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJE YXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5p cXVlSURCRGF0YWJhc2UuY3BwCmluZGV4IGJlNmIxMzI0MDAyOTdmZjQ2YjM1NDJmOWE1NzcyNzU3 YmE1MzdhODEuLjI3NGJiZjFiNDZhNDQ3ZjRiMWQzYmJkMGU2OGUyOWNiYjkxZDZhY2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJE YXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAtMzc5LDYgKzM3OSw4IEBAIHZvaWQgVW5pcXVlSURC RGF0YWJhc2U6OmhhbmRsZURlbGV0ZShJREJDb25uZWN0aW9uVG9DbGllbnQmIGNvbm5lY3Rpb24s IGNvbnN0IElECiAKICAgICBtX3BlbmRpbmdPcGVuREJSZXF1ZXN0cy5hZGQoU2VydmVyT3BlbkRC UmVxdWVzdDo6Y3JlYXRlKGNvbm5lY3Rpb24sIHJlcXVlc3REYXRhKSk7CiAgICAgaGFuZGxlRGF0 YWJhc2VPcGVyYXRpb25zKCk7CisKKyAgICB0cnlDbG9zZUFuZFJlbW92ZUZyb21TZXJ2ZXIoKTsK IH0KIAogdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6c3RhcnRWZXJzaW9uQ2hhbmdlVHJhbnNhY3Rp b24oKQpAQCAtOTQ2LDYgKzk0OCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNvbm5lY3Rp b25DbG9zZWRGcm9tQ2xpZW50KFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYKICAgICAgICAg ICAgIGhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucygpOwogICAgICAgICAgICAgaGFuZGxlVHJhbnNh Y3Rpb25zKCk7CiAKKyAgICAgICAgICAgIHRyeUNsb3NlQW5kUmVtb3ZlRnJvbVNlcnZlcigpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtOTYxLDYgKzk2NCw4IEBA IHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNvbm5lY3Rpb25DbG9zZWRGcm9tQ2xpZW50KFVuaXF1 ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYKICAgICAvLyBOb3cgdGhhdCBhIGRhdGFiYXNlIGNvbm5l Y3Rpb24gaGFzIGNsb3NlZCwgcHJldmlvdXNseSBibG9ja2VkIG9wZXJhdGlvbnMgbWlnaHQgYmUg cnVubmFibGUuCiAgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRpb25zKCk7CiAgICAgaGFuZGxlVHJh bnNhY3Rpb25zKCk7CisKKyAgICB0cnlDbG9zZUFuZFJlbW92ZUZyb21TZXJ2ZXIoKTsKIH0KIAog dm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y29ubmVjdGlvbkNsb3NlZEZyb21TZXJ2ZXIoVW5pcXVl SURCRGF0YWJhc2VDb25uZWN0aW9uJiBjb25uZWN0aW9uKQpAQCAtMTE5MCw2ICsxMTk1LDE4IEBA IHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNsb3NlKCkKICAgICB9CiB9CiAKK3ZvaWQgVW5pcXVl SURCRGF0YWJhc2U6OnRyeUNsb3NlQW5kUmVtb3ZlRnJvbVNlcnZlcigpCit7CisgICAgaWYgKG1f YmFja2luZ1N0b3JlICYmIG1fYmFja2luZ1N0b3JlLT5pc0VwaGVtZXJhbCgpKQorICAgICAgICBy ZXR1cm47CisKKyAgICBpZiAoaGFzQW55T3BlbkNvbm5lY3Rpb25zKCkgfHwgbV92ZXJzaW9uQ2hh bmdlRGF0YWJhc2VDb25uZWN0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBjbG9zZSgpOwor ICAgIG1fc2VydmVyLnJlbW92ZVVuaXF1ZUlEQkRhdGFiYXNlKG1faWRlbnRpZmllcik7Cit9CisK IFJlZlB0cjxTZXJ2ZXJPcGVuREJSZXF1ZXN0PiBVbmlxdWVJREJEYXRhYmFzZTo6dGFrZU5leHRS dW5uYWJsZVJlcXVlc3QoUmVxdWVzdFR5cGUgcmVxdWVzdFR5cGUpCiB7CiAgICAgLy8gQ29ubmVj dGlvbiBvZiByZXF1ZXN0IG1heSBiZSBjbG9zZWQgb3IgbG9zdC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNl LmgKaW5kZXggMWM2ODg3MzUwNjAyNmVmZGVmYTBkNzI3OTNjZThjYTJjNzRjNDQ5OS4uYjk0M2Q2 YzYzNzk0ZWRjZWE0MTI1MWQ3YWUzOTEzOGRmOTRmYTk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNl LmgKQEAgLTEzNiw2ICsxMzYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGVsZXRlQmFja2luZ1N0 b3JlKCk7CiAgICAgdm9pZCBkaWREZWxldGVCYWNraW5nU3RvcmUodWludDY0X3QgZGVsZXRlZFZl cnNpb24pOwogICAgIHZvaWQgY2xvc2UoKTsKKyAgICB2b2lkIHRyeUNsb3NlQW5kUmVtb3ZlRnJv bVNlcnZlcigpOwogCiAgICAgYm9vbCBpc0N1cnJlbnRseUluVXNlKCkgY29uc3Q7CiAgICAgdm9p ZCBjbGVhclN0YWxlUGVuZGluZ09wZW5EQlJlcXVlc3RzKCk7Cg== 394943 2020-03-30 11:51:55 -0700 2020-03-30 12:23:11 -0700 Patch for landing bug-209532-20200330115155.patch text/plain 5405 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM3YWRjZTQwZDI3OTI3 Y2IwMmQzNDUzNmY1Mjg5NjUwOWZkNjIzMi4uMjBiYTgxOTY4YTJmNjRhMmMyZjg3YTBjYTZkYjA1 NDk5ODI0NzQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAzLTMwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEluZGV4ZWREQjogZGVzdHJv eSBVbmlxdWVJREJEYXRhYmFzZSB3aGVuIGl0J3Mgbm90IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTUzMgorICAgICAgICA8cmRhcjovL3By b2JsZW0vNjA5MDY5MDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisK KyAgICAgICAgV2hlbiBhbGwgY29ubmVjdGlvbnMgb2YgYSBVbmlxdWVJREJEYXRhYmFzZSBvYmpl Y3QgYXJlIGNsb3NlZCBhbmQgdGhlcmUgYXJlIG5vIHBlbmRpbmcgcmV1cWVzdHMsIHRoZSAKKyAg ICAgICAgb2JqZWN0IG1heSBub3QgYmUgdXNlZCBhbnkgbW9yZS4gV2Ugc2hvdWxkIGRlbGV0ZSBp dCBmb3IgYmV0dGVyIG1lbW9yeSB1c2UuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvSURCU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2Vy dmVyOjpkZWxldGVEYXRhYmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNl cnZlcjo6ZXN0YWJsaXNoVHJhbnNhY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVy OjpJREJTZXJ2ZXI6OmRhdGFiYXNlQ29ubmVjdGlvbkNsb3NlZCk6CisgICAgICAgIChXZWJDb3Jl OjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6b3BlbkRCUmVxdWVzdENhbmNlbGxlZCk6CisgICAgICAg ICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnRyeUNsb3NlKToKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaDoKKwog MjAyMC0wMy0zMCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0NvY29hXSBTbGVlcCBkaXNhYmxpbmcgc2hvdWxkIGJlIHBlcmZvcm1lZCBpbiB0aGUgVUkg cHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL0lEQlNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvSURCU2VydmVyLmNwcAppbmRleCBmYTFjYTY2OWE1NTU0MjQ1ZjIzNzkwMGI1OGRhNWQzNTk3 NTY0NjI2Li41MWEwZWVjZGRmZjE4NmExNzVjNjU2MjA5ZWRjYjdiNTdmN2FjMWU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVy LmNwcApAQCAtMTY5LDYgKzE2OSw4IEBAIHZvaWQgSURCU2VydmVyOjpkZWxldGVEYXRhYmFzZShj b25zdCBJREJSZXF1ZXN0RGF0YSYgcmVxdWVzdERhdGEpCiAgICAgICAgIGRhdGFiYXNlID0gJmdl dE9yQ3JlYXRlVW5pcXVlSURCRGF0YWJhc2UocmVxdWVzdERhdGEuZGF0YWJhc2VJZGVudGlmaWVy KCkpOwogCiAgICAgZGF0YWJhc2UtPmhhbmRsZURlbGV0ZSgqY29ubmVjdGlvbiwgcmVxdWVzdERh dGEpOworICAgIGlmIChkYXRhYmFzZS0+dHJ5Q2xvc2UoKSkKKyAgICAgICAgbV91bmlxdWVJREJE YXRhYmFzZU1hcC5yZW1vdmUoZGF0YWJhc2UtPmlkZW50aWZpZXIoKSk7CiB9CiAKIHN0ZDo6dW5p cXVlX3B0cjxVbmlxdWVJREJEYXRhYmFzZT4gSURCU2VydmVyOjpjbG9zZUFuZFRha2VVbmlxdWVJ REJEYXRhYmFzZShVbmlxdWVJREJEYXRhYmFzZSYgZGF0YWJhc2UpCkBAIC0zOTIsMTEgKzM5NCwx NCBAQCB2b2lkIElEQlNlcnZlcjo6ZXN0YWJsaXNoVHJhbnNhY3Rpb24odWludDY0X3QgZGF0YWJh c2VDb25uZWN0aW9uSWRlbnRpZmllciwgY29ucwogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkp OwogICAgIEFTU0VSVChtX2xvY2suaXNIZWxkKCkpOwogCi0gICAgYXV0byBkYXRhYmFzZUNvbm5l Y3Rpb24gPSBtX2RhdGFiYXNlQ29ubmVjdGlvbnMuZ2V0KGRhdGFiYXNlQ29ubmVjdGlvbklkZW50 aWZpZXIpOworICAgIGF1dG8qIGRhdGFiYXNlQ29ubmVjdGlvbiA9IG1fZGF0YWJhc2VDb25uZWN0 aW9ucy5nZXQoZGF0YWJhc2VDb25uZWN0aW9uSWRlbnRpZmllcik7CiAgICAgaWYgKCFkYXRhYmFz ZUNvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIGRhdGFiYXNlID0gZGF0 YWJhc2VDb25uZWN0aW9uLT5kYXRhYmFzZSgpOwogICAgIGRhdGFiYXNlQ29ubmVjdGlvbi0+ZXN0 YWJsaXNoVHJhbnNhY3Rpb24oaW5mbyk7CisgICAgaWYgKGRhdGFiYXNlLT50cnlDbG9zZSgpKQor ICAgICAgICBtX3VuaXF1ZUlEQkRhdGFiYXNlTWFwLnJlbW92ZShkYXRhYmFzZS0+aWRlbnRpZmll cigpKTsKIH0KIAogdm9pZCBJREJTZXJ2ZXI6OmNvbW1pdFRyYW5zYWN0aW9uKGNvbnN0IElEQlJl c291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyKQpAQCAtNDQ3LDExICs0NTIs MTQgQEAgdm9pZCBJREJTZXJ2ZXI6OmRhdGFiYXNlQ29ubmVjdGlvbkNsb3NlZCh1aW50NjRfdCBk YXRhYmFzZUNvbm5lY3Rpb25JZGVudGlmaWVyKQogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkp OwogICAgIEFTU0VSVChtX2xvY2suaXNIZWxkKCkpOwogCi0gICAgYXV0byBkYXRhYmFzZUNvbm5l Y3Rpb24gPSBtX2RhdGFiYXNlQ29ubmVjdGlvbnMuZ2V0KGRhdGFiYXNlQ29ubmVjdGlvbklkZW50 aWZpZXIpOworICAgIGF1dG8qIGRhdGFiYXNlQ29ubmVjdGlvbiA9IG1fZGF0YWJhc2VDb25uZWN0 aW9ucy5nZXQoZGF0YWJhc2VDb25uZWN0aW9uSWRlbnRpZmllcik7CiAgICAgaWYgKCFkYXRhYmFz ZUNvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIGRhdGFiYXNlID0gZGF0 YWJhc2VDb25uZWN0aW9uLT5kYXRhYmFzZSgpOwogICAgIGRhdGFiYXNlQ29ubmVjdGlvbi0+Y29u bmVjdGlvbkNsb3NlZEZyb21DbGllbnQoKTsKKyAgICBpZiAoZGF0YWJhc2UtPnRyeUNsb3NlKCkp CisgICAgICAgIG1fdW5pcXVlSURCRGF0YWJhc2VNYXAucmVtb3ZlKGRhdGFiYXNlLT5pZGVudGlm aWVyKCkpOwogfQogCiB2b2lkIElEQlNlcnZlcjo6YWJvcnRPcGVuQW5kVXBncmFkZU5lZWRlZCh1 aW50NjRfdCBkYXRhYmFzZUNvbm5lY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJREJSZXNvdXJjZUlk ZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllcikKQEAgLTQ5Miw2ICs1MDAsOCBAQCB2b2lk IElEQlNlcnZlcjo6b3BlbkRCUmVxdWVzdENhbmNlbGxlZChjb25zdCBJREJSZXF1ZXN0RGF0YSYg cmVxdWVzdERhdGEpCiAgICAgICAgIHJldHVybjsKIAogICAgIHVuaXF1ZUlEQkRhdGFiYXNlLT5v cGVuREJSZXF1ZXN0Q2FuY2VsbGVkKHJlcXVlc3REYXRhLnJlcXVlc3RJZGVudGlmaWVyKCkpOwor ICAgIGlmICh1bmlxdWVJREJEYXRhYmFzZS0+dHJ5Q2xvc2UoKSkKKyAgICAgICAgbV91bmlxdWVJ REJEYXRhYmFzZU1hcC5yZW1vdmUodW5pcXVlSURCRGF0YWJhc2UtPmlkZW50aWZpZXIoKSk7CiB9 CiAKIHZvaWQgSURCU2VydmVyOjpnZXRBbGxEYXRhYmFzZU5hbWVzKElEQkNvbm5lY3Rpb25JZGVu dGlmaWVyIHNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBjb25zdCBTZWN1cml0eU9yaWdpbkRh dGEmIG1haW5GcmFtZU9yaWdpbiwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBvcGVuaW5nT3Jp Z2luLCB1aW50NjRfdCBjYWxsYmFja0lEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKaW5kZXgg YmU2YjEzMjQwMDI5N2ZmNDZiMzU0MmY5YTU3NzI3NTdiYTUzN2E4MS4uNTg1MzI1NTZiODQ5Nzdk ZTQ5OGJiNTQ0NmIzNGZkNWNhNWNkYjg3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBA IC0xMTkwLDYgKzExOTAsMTggQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y2xvc2UoKQogICAg IH0KIH0KIAorYm9vbCBVbmlxdWVJREJEYXRhYmFzZTo6dHJ5Q2xvc2UoKQoreworICAgIGlmICht X2JhY2tpbmdTdG9yZSAmJiBtX2JhY2tpbmdTdG9yZS0+aXNFcGhlbWVyYWwoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgaWYgKGhhc0FueU9wZW5Db25uZWN0aW9ucygpIHx8IG1fdmVy c2lvbkNoYW5nZURhdGFiYXNlQ29ubmVjdGlvbikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgY2xvc2UoKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogUmVmUHRyPFNlcnZlck9wZW5EQlJl cXVlc3Q+IFVuaXF1ZUlEQkRhdGFiYXNlOjp0YWtlTmV4dFJ1bm5hYmxlUmVxdWVzdChSZXF1ZXN0 VHlwZSByZXF1ZXN0VHlwZSkKIHsKICAgICAvLyBDb25uZWN0aW9uIG9mIHJlcXVlc3QgbWF5IGJl IGNsb3NlZCBvciBsb3N0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaAppbmRleCAxYzY4ODczNTA2MDI2 ZWZkZWZhMGQ3Mjc5M2NlOGNhMmM3NGM0NDk5Li41Njk4MDMxNDg2NjRiNWFmMjQ2ZWU4ZTY3OGVh OThmZmM0MDU1NGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaApAQCAtMTEwLDYgKzExMCw3IEBA IHB1YmxpYzoKICAgICB2b2lkIGltbWVkaWF0ZUNsb3NlRm9yVXNlckRlbGV0ZSgpOwogCiAgICAg dm9pZCBhYm9ydEFjdGl2ZVRyYW5zYWN0aW9ucygpOworICAgIGJvb2wgdHJ5Q2xvc2UoKTsKIAog cHJpdmF0ZToKICAgICB2b2lkIGhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucygpOwo=