209618 2020-03-26 13:30:00 -0700 REGRESSION(r259034): access to null UniqueIDBDatabase in UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection() 2020-03-26 16:10:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen alecflett beidson cdumez ews-watchlist ggaren jsbell webkit-bug-importer oldest_to_newest 1634539 0 sihui_liu 2020-03-26 13:30:00 -0700 ~UniqueIDBDatabaseConnection should happen before ~UniqueIDBDatabase, but we protect UniqueIDBDatabaseConnection in UniqueIDBDatabase::connectionClosedFromClient. 1634540 1 sihui_liu 2020-03-26 13:31:05 -0700 <rdar://problem/60919105> 1634543 2 394654 sihui_liu 2020-03-26 13:39:05 -0700 Created attachment 394654 Patch 1634579 3 394654 ggaren 2020-03-26 14:42:37 -0700 Comment on attachment 394654 Patch It's not great for correctness to rely on destruction order. We don't have a smart reliable way to guarantee destruction order. I think a better solution in this case would be to change UniqueIDBDatabaseConnection to hold a direct pointer to IDBServer. That way, there's no need to deference UniqueIDBDatabase in the destructor. Also, it would be good to change UniqueIDBDatabaseConnection::m_database to be a WeakPtr, for memory safety. (That way, a bug like this will be detectable even without guard malloc, and will not become a security bug.) 1634594 4 394662 sihui_liu 2020-03-26 15:15:55 -0700 Created attachment 394662 Patch 1634597 5 394662 ggaren 2020-03-26 15:20:10 -0700 Comment on attachment 394662 Patch r=me 1634622 6 ews-feeder 2020-03-26 16:10:05 -0700 Committed r259090: <https://trac.webkit.org/changeset/259090> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394662. 394654 2020-03-26 13:39:05 -0700 2020-03-26 15:15:53 -0700 Patch bug-209618-20200326133904.patch text/plain 4238 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwNWE1MWFmZTFkMGQw Y2RhZmU1Yjg4MjE0ZWJiOWVjNTJkMTNjZC4uYmZmMjNkMDk2YThhOTQ4ODY1ODJlZDY1YTIzMDhk M2ZhMDYyOTQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAzLTI2ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI1OTAz NCk6IGFjY2VzcyB0byBudWxsIFVuaXF1ZUlEQkRhdGFiYXNlIGluIFVuaXF1ZUlEQkRhdGFiYXNl Q29ubmVjdGlvbjo6flVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbigpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk2MTgKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYwOTE5MTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1ha2Ugc3VyZSBVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24gaXMgZGVz dHJveWVkIGJlZm9yZSBVbmlxdWVJREJEYXRhYmFzZS4KKworICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ REJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpjb25uZWN0aW9uQ2xvc2VkRnJvbUNsaWVudCk6 IHJlbGVhc2UgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uIHdoZW4KKyAgICAgICAgaXQgaXMg bm8gbG9uZ2VyIHVzZWQgaW4gVW5pcXVlSURCRGF0YWJhc2U6OmNvbm5lY3Rpb25DbG9zZWRGcm9t Q2xpZW50LCBhcyB0cnlDbG9zZUFuZFJlbW92ZUZyb21TZXJ2ZXIgbWF5IAorICAgICAgICBkZXN0 cm95IFVuaXF1ZUlEQkRhdGFiYXNlLgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9VbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURC U2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb246OmFib3J0VHJhbnNhY3Rpb25XaXRo b3V0Q2FsbGJhY2spOiB3ZSBkb24ndCBkbyBjYWxsYmFjayAKKyAgICAgICAgYXN5bmNocm5vdXNs eSBub3cgc28gbm8gbmVlZCB0byBwcm90ZWN0LgorCiAyMDIwLTAzLTI2ICBSb2IgQnVpcyAgPHJi dWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgcmVmZXJyZXItcG9s aWN5IGluIGFwcGVuZCBPcmlnaW4gaGVhZGVyIGFsZ29yaXRobQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFz ZS5jcHAKaW5kZXggMjc0YmJmMWI0NmE0NDdmNGIxZDNiYmQwZTY4ZTI5Y2JiOTFkNmFjYy4uMDgy YWIzMTMxNmFiZjk0ZGMxYjVjMDZhOTg5YTFkY2JkOGQwYTgwNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0 YWJhc2UuY3BwCkBAIC05MzUsNyArOTM1LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y29u bmVjdGlvbkNsb3NlZEZyb21DbGllbnQoVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uJgogICAg IEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogICAgIExPRyhJbmRleGVkREIsICJVbmlxdWVJREJE YXRhYmFzZTo6Y29ubmVjdGlvbkNsb3NlZEZyb21DbGllbnQgLSAlcyAoJSIgUFJJdTY0ICIpIiwg Y29ubmVjdGlvbi5vcGVuUmVxdWVzdElkZW50aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgp LmRhdGEoKSwgY29ubmVjdGlvbi5pZGVudGlmaWVyKCkpOwogCi0gICAgUmVmPFVuaXF1ZUlEQkRh dGFiYXNlQ29ubmVjdGlvbj4gcHJvdGVjdGVkQ29ubmVjdGlvbihjb25uZWN0aW9uKTsKKyAgICBS ZWZQdHI8VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uPiBwcm90ZWN0ZWRDb25uZWN0aW9uID0g JmNvbm5lY3Rpb247CiAgICAgbV9vcGVuRGF0YWJhc2VDb25uZWN0aW9ucy5yZW1vdmUoJmNvbm5l Y3Rpb24pOwogCiAgICAgaWYgKG1fdmVyc2lvbkNoYW5nZURhdGFiYXNlQ29ubmVjdGlvbiA9PSAm Y29ubmVjdGlvbikgewpAQCAtOTQzLDYgKzk0Myw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6 OmNvbm5lY3Rpb25DbG9zZWRGcm9tQ2xpZW50KFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYK ICAgICAgICAgaWYgKG1fdmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9uKSB7CiAgICAgICAgICAgICBj b25uZWN0aW9uLmFib3J0VHJhbnNhY3Rpb25XaXRob3V0Q2FsbGJhY2soKm1fdmVyc2lvbkNoYW5n ZVRyYW5zYWN0aW9uKTsKICAgICAgICAgICAgIEFTU0VSVCghY29ubmVjdGlvbi5oYXNOb25GaW5p c2hlZFRyYW5zYWN0aW9ucygpKTsKKyAgICAgICAgICAgIHByb3RlY3RlZENvbm5lY3Rpb24gPSBu dWxscHRyOwogCiAgICAgICAgICAgICAvLyBQcmV2aW91cyBibG9ja2VkIG9wZXJhdGlvbnMgb3Ig dHJhbnNhY3Rpb25zIG1heSBiZSBydW5uYWJsZS4KICAgICAgICAgICAgIGhhbmRsZURhdGFiYXNl T3BlcmF0aW9ucygpOwpAQCAtOTYwLDYgKzk2MSw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6 OmNvbm5lY3Rpb25DbG9zZWRGcm9tQ2xpZW50KFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYK ICAgICAgICAgbm90aWZ5Q3VycmVudFJlcXVlc3RDb25uZWN0aW9uQ2xvc2VkT3JGaXJlZFZlcnNp b25DaGFuZ2VFdmVudChjb25uZWN0aW9uLmlkZW50aWZpZXIoKSk7CiAKICAgICBBU1NFUlQoIWNv bm5lY3Rpb24uaGFzTm9uRmluaXNoZWRUcmFuc2FjdGlvbnMoKSk7CisgICAgcHJvdGVjdGVkQ29u bmVjdGlvbiA9IG51bGxwdHI7CiAKICAgICAvLyBOb3cgdGhhdCBhIGRhdGFiYXNlIGNvbm5lY3Rp b24gaGFzIGNsb3NlZCwgcHJldmlvdXNseSBibG9ja2VkIG9wZXJhdGlvbnMgbWlnaHQgYmUgcnVu bmFibGUuCiAgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRpb25zKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VDb25u ZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9Vbmlx dWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uY3BwCmluZGV4IGJlNWRkZGU5YzAyZmQ1MDQwYTY4MGEx NmE0ZTk2MzgwYjM0ZWMwNjkuLjQxM2M4NjI2ZjMyOWQ0OGUxM2EwMTg3NDMzMjIzMDIxMjRmMDY2 MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9V bmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uY3BwCkBAIC02 OSw5ICs2OSw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOjphYm9ydFRyYW5z YWN0aW9uV2l0aG91dENhbGxiYWNrKFVuaXF1ZUlEQkRhdGFiCiAgICAgQVNTRVJUKG1fdHJhbnNh Y3Rpb25NYXAuY29udGFpbnModHJhbnNhY3Rpb24uaW5mbygpLmlkZW50aWZpZXIoKSkpOwogCiAg ICAgY29uc3QgYXV0byYgdHJhbnNhY3Rpb25JZGVudGlmaWVyID0gdHJhbnNhY3Rpb24uaW5mbygp LmlkZW50aWZpZXIoKTsKLSAgICBSZWZQdHI8VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uPiBw cm90ZWN0ZWRUaGlzKHRoaXMpOwotCi0gICAgbV9kYXRhYmFzZS0+YWJvcnRUcmFuc2FjdGlvbih0 cmFuc2FjdGlvbiwgW3RoaXMsIHByb3RlY3RlZFRoaXMsIHRyYW5zYWN0aW9uSWRlbnRpZmllcl0o Y29uc3QgSURCRXJyb3ImKSB7CisgICAgbV9kYXRhYmFzZS0+YWJvcnRUcmFuc2FjdGlvbih0cmFu c2FjdGlvbiwgW3RoaXMsIHRyYW5zYWN0aW9uSWRlbnRpZmllcl0oY29uc3QgSURCRXJyb3ImKSB7 CiAgICAgICAgIEFTU0VSVChtX3RyYW5zYWN0aW9uTWFwLmNvbnRhaW5zKHRyYW5zYWN0aW9uSWRl bnRpZmllcikpOwogICAgICAgICBtX3RyYW5zYWN0aW9uTWFwLnJlbW92ZSh0cmFuc2FjdGlvbklk ZW50aWZpZXIpOwogICAgIH0pOwo= 394662 2020-03-26 15:15:55 -0700 2020-03-26 16:10:06 -0700 Patch bug-209618-20200326151555.patch text/plain 6726 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwNWE1MWFmZTFkMGQw Y2RhZmU1Yjg4MjE0ZWJiOWVjNTJkMTNjZC4uNWZmYTRmYjYzYTNiNWNhYmQzYjI2NTMyZDJiNzE3 ZDc5N2MzYzhlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTI2ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI1OTAz NCk6IGFjY2VzcyB0byBudWxsIFVuaXF1ZUlEQkRhdGFiYXNlIGluIFVuaXF1ZUlEQkRhdGFiYXNl Q29ubmVjdGlvbjo6flVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbigpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk2MTgKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYwOTE5MTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEl0J3MgcG9zc2libGUgVW5pcXVlSURCRGF0YWJhc2UgaXMgZGVzdHJveWVk IGJlZm9yZSBVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24gaW4gCisgICAgICAgIFVuaXF1ZUlE QkRhdGFiYXNlOjpjb25uZWN0aW9uQ2xvc2VkRnJvbUNsaWVudCwgc28gaXQncyBiZXR0ZXIgbm90 IGFjY2VzcyAKKyAgICAgICAgVW5pcXVlSURCRGF0YWJhc2UgaW4gflVuaXF1ZUlEQkRhdGFiYXNl Q29ubmVjdGlvbigpIGFuZCBsZXQgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uIGhhdmUgYSBJ REJTZXJ2ZXIgbWVtYmVyLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1Vu aXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2 ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0 aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2VDb25u ZWN0aW9uOjp+VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOjphYm9ydFRyYW5zYWN0aW9u V2l0aG91dENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURC RGF0YWJhc2VDb25uZWN0aW9uOjpjb25uZWN0aW9uQ2xvc2VkRnJvbUNsaWVudCk6CisgICAgICAg IChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6ZGlkRmly ZVZlcnNpb25DaGFuZ2VFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1 ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6ZGlkRmluaXNoSGFuZGxpbmdWZXJzaW9uQ2hhbmdlKToK KyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9u Ojplc3RhYmxpc2hUcmFuc2FjdGlvbik6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1VuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SURC U2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb246OmRhdGFiYXNlKToKKyAgICAgICAg KFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOjpzZXJ2ZXIp OgorCiAyMDIwLTAzLTI2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAg VGFrZSBpbnRvIGFjY291bnQgcmVmZXJyZXItcG9saWN5IGluIGFwcGVuZCBPcmlnaW4gaGVhZGVy IGFsZ29yaXRobQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uLmNwcApp bmRleCBiZTVkZGRlOWMwMmZkNTA0MGE2ODBhMTZhNGU5NjM4MGIzNGVjMDY5Li43NzU4NjQzNzVm MmU0YzJkZmJhOTE0NWUxZTE0YWZjNzVlMTUwNTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURC RGF0YWJhc2VDb25uZWN0aW9uLmNwcApAQCAtNDMsMTEgKzQzLDEyIEBAIFJlZjxVbmlxdWVJREJE YXRhYmFzZUNvbm5lY3Rpb24+IFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6Y3JlYXRlKFVu aXF1ZUlEQkRhCiB9CiAKIFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6VW5pcXVlSURCRGF0 YWJhc2VDb25uZWN0aW9uKFVuaXF1ZUlEQkRhdGFiYXNlJiBkYXRhYmFzZSwgU2VydmVyT3BlbkRC UmVxdWVzdCYgcmVxdWVzdCkKLSAgICA6IG1fZGF0YWJhc2UoJmRhdGFiYXNlKQorICAgIDogbV9k YXRhYmFzZShtYWtlV2Vha1B0cihkYXRhYmFzZSkpCisgICAgLCBtX3NlcnZlcihkYXRhYmFzZS5z ZXJ2ZXIoKSkKICAgICAsIG1fY29ubmVjdGlvblRvQ2xpZW50KHJlcXVlc3QuY29ubmVjdGlvbigp KQogICAgICwgbV9vcGVuUmVxdWVzdElkZW50aWZpZXIocmVxdWVzdC5yZXF1ZXN0RGF0YSgpLnJl cXVlc3RJZGVudGlmaWVyKCkpCiB7Ci0gICAgc2VydmVyKCktPnJlZ2lzdGVyRGF0YWJhc2VDb25u ZWN0aW9uKCp0aGlzKTsKKyAgICBtX3NlcnZlci5yZWdpc3RlckRhdGFiYXNlQ29ubmVjdGlvbigq dGhpcyk7CiAgICAgbV9jb25uZWN0aW9uVG9DbGllbnQtPnJlZ2lzdGVyRGF0YWJhc2VDb25uZWN0 aW9uKCp0aGlzKTsKIH0KIApAQCAtNTUsNyArNTYsNyBAQCBVbmlxdWVJREJEYXRhYmFzZUNvbm5l Y3Rpb246On5VbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24oKQogewogICAgIEFTU0VSVChtX3Ry YW5zYWN0aW9uTWFwLmlzRW1wdHkoKSk7CiAKLSAgICBzZXJ2ZXIoKS0+dW5yZWdpc3RlckRhdGFi YXNlQ29ubmVjdGlvbigqdGhpcyk7CisgICAgbV9zZXJ2ZXIudW5yZWdpc3RlckRhdGFiYXNlQ29u bmVjdGlvbigqdGhpcyk7CiAgICAgbV9jb25uZWN0aW9uVG9DbGllbnQtPnVucmVnaXN0ZXJEYXRh YmFzZUNvbm5lY3Rpb24oKnRoaXMpOwogfQogCkBAIC02NywxMSArNjgsMTAgQEAgYm9vbCBVbmlx dWVJREJEYXRhYmFzZUNvbm5lY3Rpb246Omhhc05vbkZpbmlzaGVkVHJhbnNhY3Rpb25zKCkgY29u c3QKIHZvaWQgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOjphYm9ydFRyYW5zYWN0aW9uV2l0 aG91dENhbGxiYWNrKFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uKQog ewogICAgIEFTU0VSVChtX3RyYW5zYWN0aW9uTWFwLmNvbnRhaW5zKHRyYW5zYWN0aW9uLmluZm8o KS5pZGVudGlmaWVyKCkpKTsKKyAgICBBU1NFUlQobV9kYXRhYmFzZSk7CiAKICAgICBjb25zdCBh dXRvJiB0cmFuc2FjdGlvbklkZW50aWZpZXIgPSB0cmFuc2FjdGlvbi5pbmZvKCkuaWRlbnRpZmll cigpOwotICAgIFJlZlB0cjxVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24+IHByb3RlY3RlZFRo aXModGhpcyk7Ci0KLSAgICBtX2RhdGFiYXNlLT5hYm9ydFRyYW5zYWN0aW9uKHRyYW5zYWN0aW9u LCBbdGhpcywgcHJvdGVjdGVkVGhpcywgdHJhbnNhY3Rpb25JZGVudGlmaWVyXShjb25zdCBJREJF cnJvciYpIHsKKyAgICBtX2RhdGFiYXNlLT5hYm9ydFRyYW5zYWN0aW9uKHRyYW5zYWN0aW9uLCBb dGhpcywgdHJhbnNhY3Rpb25JZGVudGlmaWVyXShjb25zdCBJREJFcnJvciYpIHsKICAgICAgICAg QVNTRVJUKG1fdHJhbnNhY3Rpb25NYXAuY29udGFpbnModHJhbnNhY3Rpb25JZGVudGlmaWVyKSk7 CiAgICAgICAgIG1fdHJhbnNhY3Rpb25NYXAucmVtb3ZlKHRyYW5zYWN0aW9uSWRlbnRpZmllcik7 CiAgICAgfSk7CkBAIC04OCw2ICs4OCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0 aW9uOjpjb25uZWN0aW9uQ2xvc2VkRnJvbUNsaWVudCgpCiB7CiAgICAgTE9HKEluZGV4ZWREQiwg IlVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6Y29ubmVjdGlvbkNsb3NlZEZyb21DbGllbnQg LSAlcyAtICUiIFBSSXU2NCwgbV9vcGVuUmVxdWVzdElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCksIGlkZW50aWZpZXIoKSk7CiAKKyAgICBBU1NFUlQobV9kYXRhYmFzZSk7 CiAgICAgbV9kYXRhYmFzZS0+Y29ubmVjdGlvbkNsb3NlZEZyb21DbGllbnQoKnRoaXMpOwogfQog CkBAIC05NSw2ICs5Niw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOjpkaWRG aXJlVmVyc2lvbkNoYW5nZUV2ZW50KGNvbnN0IElEQlJlc291cmNlSWRlCiB7CiAgICAgTE9HKElu ZGV4ZWREQiwgIlVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6ZGlkRmlyZVZlcnNpb25DaGFu Z2VFdmVudCAtICVzIC0gJSIgUFJJdTY0LCBtX29wZW5SZXF1ZXN0SWRlbnRpZmllci5sb2dnaW5n U3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgaWRlbnRpZmllcigpKTsKIAorICAgIEFTU0VSVChtX2Rh dGFiYXNlKTsKICAgICBtX2RhdGFiYXNlLT5kaWRGaXJlVmVyc2lvbkNoYW5nZUV2ZW50KCp0aGlz LCByZXF1ZXN0SWRlbnRpZmllciwgY29ubmVjdGlvbkNsb3NlZCk7CiB9CiAKQEAgLTEwMiw2ICsx MDQsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbjo6ZGlkRmluaXNoSGFuZGxp bmdWZXJzaW9uQ2hhbmdlKGNvbnN0IElEQlJlc291cgogewogICAgIExPRyhJbmRleGVkREIsICJV bmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb246OmRpZEZpbmlzaEhhbmRsaW5nVmVyc2lvbkNoYW5n ZSAtICVzIC0gJSIgUFJJdTY0LCB0cmFuc2FjdGlvbklkZW50aWZpZXIubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCksIGlkZW50aWZpZXIoKSk7CiAKKyAgICBBU1NFUlQobV9kYXRhYmFzZSk7 CiAgICAgbV9kYXRhYmFzZS0+ZGlkRmluaXNoSGFuZGxpbmdWZXJzaW9uQ2hhbmdlKCp0aGlzLCB0 cmFuc2FjdGlvbklkZW50aWZpZXIpOwogfQogCkBAIC0xMzcsNiArMTQwLDcgQEAgdm9pZCBVbmlx dWVJREJEYXRhYmFzZUNvbm5lY3Rpb246OmVzdGFibGlzaFRyYW5zYWN0aW9uKGNvbnN0IElEQlRy YW5zYWN0aW9uSW5mbyYKICAgICBSZWY8VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbj4gdHJh bnNhY3Rpb24gPSBVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uOjpjcmVhdGUoKnRoaXMsIGlu Zm8pOwogICAgIG1fdHJhbnNhY3Rpb25NYXAuc2V0KHRyYW5zYWN0aW9uLT5pbmZvKCkuaWRlbnRp ZmllcigpLCAmdHJhbnNhY3Rpb24uZ2V0KCkpOwogCisgICAgQVNTRVJUKG1fZGF0YWJhc2UpOwog ICAgIG1fZGF0YWJhc2UtPmVucXVldWVUcmFuc2FjdGlvbihXVEZNb3ZlKHRyYW5zYWN0aW9uKSk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9VbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24uaAppbmRleCA1NmFi ZTg4YjcwZGFhN2RlZDUxMzlkNjcyYTBkNTlhZGFhYjRiMWYzLi43NWM5MjQzYjVhYTUyNWM4YTdh ZmM2ZDhhNmFiYzVmZWQ1YWE3ZDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlQ29u bmVjdGlvbi5oCkBAIC01Myw4ICs1Myw4IEBAIHB1YmxpYzoKICAgICB+VW5pcXVlSURCRGF0YWJh c2VDb25uZWN0aW9uKCk7CiAKICAgICBjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIG9wZW5S ZXF1ZXN0SWRlbnRpZmllcigpIHsgcmV0dXJuIG1fb3BlblJlcXVlc3RJZGVudGlmaWVyOyB9Ci0g ICAgVW5pcXVlSURCRGF0YWJhc2UqIGRhdGFiYXNlKCkgeyByZXR1cm4gbV9kYXRhYmFzZTsgfQot ICAgIElEQlNlcnZlciogc2VydmVyKCkgeyByZXR1cm4gJm1fZGF0YWJhc2UtPnNlcnZlcigpOyB9 CisgICAgVW5pcXVlSURCRGF0YWJhc2UqIGRhdGFiYXNlKCkgeyByZXR1cm4gbV9kYXRhYmFzZS5n ZXQoKTsgfQorICAgIElEQlNlcnZlciogc2VydmVyKCkgeyByZXR1cm4gJm1fc2VydmVyOyB9CiAg ICAgSURCQ29ubmVjdGlvblRvQ2xpZW50JiBjb25uZWN0aW9uVG9DbGllbnQoKSB7IHJldHVybiBt X2Nvbm5lY3Rpb25Ub0NsaWVudDsgfQogCiAgICAgdm9pZCBjb25uZWN0aW9uUGVuZGluZ0Nsb3Nl RnJvbUNsaWVudCgpOwpAQCAtODksNyArODksOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFVu aXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbihVbmlxdWVJREJEYXRhYmFzZSYsIFNlcnZlck9wZW5E QlJlcXVlc3QmKTsKIAotICAgIFVuaXF1ZUlEQkRhdGFiYXNlKiBtX2RhdGFiYXNlOworICAgIFdl YWtQdHI8VW5pcXVlSURCRGF0YWJhc2U+IG1fZGF0YWJhc2U7CisgICAgSURCU2VydmVyJiBtX3Nl cnZlcjsKICAgICBSZWY8SURCQ29ubmVjdGlvblRvQ2xpZW50PiBtX2Nvbm5lY3Rpb25Ub0NsaWVu dDsKICAgICBJREJSZXNvdXJjZUlkZW50aWZpZXIgbV9vcGVuUmVxdWVzdElkZW50aWZpZXI7CiAK