198939 2019-06-17 16:27:24 -0700 Protect StorageManager::m_localStorageNamespaces with a Lock 2019-06-17 17:17:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren webkit-bug-importer oldest_to_newest 1545446 0 achristensen 2019-06-17 16:27:24 -0700 Protect StorageManager::m_localStorageNamespaces with a Lock 1545451 1 372286 achristensen 2019-06-17 16:29:15 -0700 Created attachment 372286 Patch 1545452 2 achristensen 2019-06-17 16:29:17 -0700 <rdar://problem/51784225> 1545470 3 372295 achristensen 2019-06-17 17:01:07 -0700 Created attachment 372295 Patch 1545477 4 372295 ggaren 2019-06-17 17:12:59 -0700 Comment on attachment 372295 Patch r=me 1545484 5 achristensen 2019-06-17 17:17:37 -0700 http://trac.webkit.org/r246526 372286 2019-06-17 16:29:15 -0700 2019-06-17 17:01:06 -0700 Patch bug-198939-20190617162914.patch text/plain 7064 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY1MjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTE3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvdGVjdCBTdG9y YWdlTWFuYWdlcjo6bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzIHdpdGggYSBMb2NrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5MzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzUxNzg0MjI1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6 OmRpZERlc3Ryb3lTdG9yYWdlQXJlYSBpcyBjYWxsZWQgZnJvbSBTdG9yYWdlQXJlYTo6flN0b3Jh Z2VBcmVhIHdoaWNoIGlzIGNhbGxlZCBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAgIEFsbCBv dGhlciBhY2Nlc3Mgb2YgbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzIGlzIGZyb20gdGhlIG5vbi1t YWluIHRocmVhZC4gIFNvbWV0aW1lcyB0aGlzIGNhdXNlcyBoYXNoIHRhYmxlIGNvcnJ1cHRpb24s IHNvIHdhaXQgZm9yIGEgbXV0ZXgKKyAgICAgICAgYmVmb3JlIGFjY2Vzc2luZyB0aGlzIG1lbWJl ciB2YXJpYWJsZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9y YWdlTmFtZXNwYWNlOjpkaWREZXN0cm95U3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgIChX ZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmln aW4pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdl T3JpZ2luc01vZGlmaWVkU2luY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6 ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAxOS0w Ni0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIEFkZCBudWxsIGNoZWNrIGluIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25JZGVudGlm aWVyVG9Jbml0aWFsUmVxdWVzdApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAy NDY1MTYpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzYsNiArMzc2LDcgQEAgdm9pZCBTdG9y YWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYQogICAgIGlmICghbV9zdG9yYWdlQXJlYU1h cC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIHN0ZDo6bG9ja19ndWFyZDxMb2Nr PiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKICAgICBBU1NFUlQobV9zdG9y YWdlTWFuYWdlci5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuY29udGFpbnMobV9zdG9yYWdlTmFt ZXNwYWNlSUQpKTsKICAgICBtX3N0b3JhZ2VNYW5hZ2VyLm1fbG9jYWxTdG9yYWdlTmFtZXNwYWNl cy5yZW1vdmUobV9zdG9yYWdlTmFtZXNwYWNlSUQpOwogfQpAQCAtNTcyLDYgKzU3Myw3IEBAIHZv aWQgU3RvcmFnZU1hbmFnZXI6OmNsb25lU2Vzc2lvblN0b3JhZ2UKICAgICAgICAgc2Vzc2lvblN0 b3JhZ2VOYW1lc3BhY2UtPmNsb25lVG8oKm5ld1Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlKTsKIAog ICAgICAgICBpZiAoIW1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyKSB7CisgICAgICAgICAg ICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRl eCk7CiAgICAgICAgICAgICBpZiAoYXV0byogbG9jYWxTdG9yYWdlTmFtZXNwYWNlID0gbV9sb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzLmdldChzdG9yYWdlTmFtZXNwYWNlSUQpKSB7CiAgICAgICAgICAg ICAgICAgTG9jYWxTdG9yYWdlTmFtZXNwYWNlKiBuZXdsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBn ZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZShuZXdTdG9yYWdlTmFtZXNwYWNlSUQpOwog ICAgICAgICAgICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xvbmVUbygqbmV3bG9jYWxT dG9yYWdlTmFtZXNwYWNlKTsKQEAgLTY2Miw2ICs2NjQsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2Vy OjpnZXRMb2NhbFN0b3JhZ2VPcmlnCiAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG1f bG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5vcmlnaW5zKCkpCiAgICAgICAgICAgICAgICAg b3JpZ2lucy5hZGQob3JpZ2luKTsKICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHN0ZDo6 bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKICAg ICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgbG9jYWxTdG9yYWdlTmFtZVNwYWNlIDogbV9sb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRv JiBvcmlnaW4gOiBsb2NhbFN0b3JhZ2VOYW1lU3BhY2UtPmVwaGVtZXJhbE9yaWdpbnMoKSkKICAg ICAgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKQEAgLTY5NSw4ICs2OTgsMTEg QEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZwogdm9pZCBTdG9yYWdl TWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbihjb25zdCBTZWN1cml0 eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luKQogewogICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbiA9IHNlY3Vy aXR5T3JpZ2luLmlzb2xhdGVkQ29weSgpXSgpIG11dGFibGUgewotICAgICAgICBmb3IgKGF1dG8m IGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMo KSkKLSAgICAgICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNN YXRjaGluZ09yaWdpbihjb3BpZWRPcmlnaW4pOworICAgICAgICB7CisgICAgICAgICAgICBzdGQ6 OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRleCk7Cisg ICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4oY29waWVkT3JpZ2luKTsKKyAg ICAgICAgfQogCiAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNw YWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQogICAgICAg ICAgICAgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01h dGNoaW5nT3JpZ2luKGNvcGllZE9yaWdpbik7CkBAIC03MTYsMTIgKzcyMiwxNiBAQCB2b2lkIFN0 b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VPCiAgICAgICAgICAgICAgICAgdHJhbnNp ZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhckFsbFN0b3JhZ2VBcmVhcygpOwogCiAgICAg ICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IG9yaWdpbnNUb0RlbGV0ZSkgewotICAg ICAgICAgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV9sb2NhbFN0 b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQotICAgICAgICAgICAgICAgICAgICBsb2NhbFN0b3Jh Z2VOYW1lc3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3JpZ2luKTsKKyAg ICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2Nr PiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKKyAgICAgICAgICAgICAgICAg ICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVz cGFjZXMudmFsdWVzKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3JpZ2luKTsKKyAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgbV9sb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXItPmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihvcmlnaW4pOwogICAg ICAgICAgICAgfQogICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgc3RkOjpsb2NrX2d1YXJk PExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXgpOwogICAgICAgICAgICAg Zm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFj ZXMudmFsdWVzKCkpCiAgICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVh ckFsbFN0b3JhZ2VBcmVhcygpOwogICAgICAgICB9CkBAIC03NDAsOCArNzUwLDExIEBAIHZvaWQg U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUUKIAogICAgIG1fcXVldWUtPmRpc3Bh dGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbnMg PSBXVEZNb3ZlKGNvcGllZE9yaWdpbnMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6 IGNvcGllZE9yaWdpbnMpIHsKLSAgICAgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFt ZXNwYWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQotICAgICAgICAgICAg ICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdp bihvcmlnaW4pOworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFy ZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKKyAgICAgICAgICAg ICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1fbG9jYWxTdG9yYWdlTmFt ZXNwYWNlcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNw YWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CisgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNw YWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQogICAgICAg ICAgICAgICAgIHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJl YXNNYXRjaGluZ09yaWdpbihvcmlnaW4pOwpAQCAtOTk5LDYgKzEwMTIsNyBAQCBTdG9yYWdlTWFu YWdlcjo6U3RvcmFnZUFyZWEqIFN0b3JhZ2VNYW5hCiAKIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0 b3JhZ2VOYW1lc3BhY2UqIFN0b3JhZ2VNYW5hZ2VyOjpnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5h bWVzcGFjZSh1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQpCiB7CisgICAgc3RkOjpsb2NrX2d1 YXJkPExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXgpOwogICAgIGlmICgh bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLmlzVmFsaWRLZXkoc3RvcmFnZU5hbWVzcGFjZUlEKSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCShyZXZpc2lv biAyNDY1MTYpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYgKzEwNSw3IEBAIHByaXZhdGU6 CiAKICAgICBSZWZQdHI8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyPiBtX2xvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlcjsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8TG9jYWxTdG9y YWdlTmFtZXNwYWNlPj4gbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzOworICAgIExvY2sgbV9sb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXg7CiAKICAgICBIYXNoTWFwPHN0ZDo6cGFpcjx1aW50NjRf dCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiwgUmVmUHRyPFRyYW5zaWVudExvY2FsU3Rv cmFnZU5hbWVzcGFjZT4+IG1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlczsKIAo= 372295 2019-06-17 17:01:07 -0700 2019-06-17 17:12:59 -0700 Patch bug-198939-20190617170106.patch text/plain 7081 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY1MjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTE3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvdGVjdCBTdG9y YWdlTWFuYWdlcjo6bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzIHdpdGggYSBMb2NrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5MzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzUxNzg0MjI1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6 OmRpZERlc3Ryb3lTdG9yYWdlQXJlYSBpcyBjYWxsZWQgZnJvbSBTdG9yYWdlQXJlYTo6flN0b3Jh Z2VBcmVhIHdoaWNoIGlzIGNhbGxlZCBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAgIEFsbCBv dGhlciBhY2Nlc3Mgb2YgbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzIGlzIGZyb20gdGhlIG5vbi1t YWluIHRocmVhZC4gIFNvbWV0aW1lcyB0aGlzIGNhdXNlcyBoYXNoIHRhYmxlIGNvcnJ1cHRpb24s IHNvIHdhaXQgZm9yIGEgbXV0ZXgKKyAgICAgICAgYmVmb3JlIGFjY2Vzc2luZyB0aGlzIG1lbWJl ciB2YXJpYWJsZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9y YWdlTmFtZXNwYWNlOjpkaWREZXN0cm95U3RvcmFnZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgIChX ZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmln aW4pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdl T3JpZ2luc01vZGlmaWVkU2luY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6 ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAxOS0w Ni0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIEFkZCBudWxsIGNoZWNrIGluIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25JZGVudGlm aWVyVG9Jbml0aWFsUmVxdWVzdApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAy NDY1MTYpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzYsNiArMzc2LDcgQEAgdm9pZCBTdG9y YWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYQogICAgIGlmICghbV9zdG9yYWdlQXJlYU1h cC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIHN0ZDo6bG9ja19ndWFyZDxMb2Nr PiBsb2NrKG1fc3RvcmFnZU1hbmFnZXIubV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXgpOwog ICAgIEFTU0VSVChtX3N0b3JhZ2VNYW5hZ2VyLm1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5jb250 YWlucyhtX3N0b3JhZ2VOYW1lc3BhY2VJRCkpOwogICAgIG1fc3RvcmFnZU1hbmFnZXIubV9sb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzLnJlbW92ZShtX3N0b3JhZ2VOYW1lc3BhY2VJRCk7CiB9CkBAIC01 NzIsNiArNTczLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNzaW9uU3RvcmFnZQog ICAgICAgICBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZS0+Y2xvbmVUbygqbmV3U2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2UpOwogCiAgICAgICAgIGlmICghbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIpIHsKKyAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlc011dGV4KTsKICAgICAgICAgICAgIGlmIChhdXRvKiBsb2NhbFN0b3JhZ2VO YW1lc3BhY2UgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KHN0b3JhZ2VOYW1lc3BhY2VJ RCkpIHsKICAgICAgICAgICAgICAgICBMb2NhbFN0b3JhZ2VOYW1lc3BhY2UqIG5ld2xvY2FsU3Rv cmFnZU5hbWVzcGFjZSA9IGdldE9yQ3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKG5ld1N0b3Jh Z2VOYW1lc3BhY2VJRCk7CiAgICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5j bG9uZVRvKCpuZXdsb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOwpAQCAtNjYyLDYgKzY2NCw3IEBAIHZv aWQgU3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWcKICAgICAgICAgICAgIGZvciAo YXV0byYgb3JpZ2luIDogbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXItPm9yaWdpbnMoKSkK ICAgICAgICAgICAgICAgICBvcmlnaW5zLmFkZChvcmlnaW4pOwogICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1l c3BhY2VzTXV0ZXgpOwogICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBsb2NhbFN0b3JhZ2VO YW1lU3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpIHsKICAgICAgICAg ICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IGxvY2FsU3RvcmFnZU5hbWVTcGFjZS0+ZXBoZW1l cmFsT3JpZ2lucygpKQogICAgICAgICAgICAgICAgICAgICBvcmlnaW5zLmFkZChvcmlnaW4pOwpA QCAtNjk1LDggKzY5OCwxMSBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VP cmlnCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VFbnRyaWVzRm9yT3Jp Z2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4pCiB7CiAgICAgbV9x dWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29w aWVkT3JpZ2luID0gc2VjdXJpdHlPcmlnaW4uaXNvbGF0ZWRDb3B5KCldKCkgbXV0YWJsZSB7Ci0g ICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV9sb2NhbFN0b3JhZ2VO YW1lc3BhY2VzLnZhbHVlcygpKQotICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5j bGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKGNvcGllZE9yaWdpbik7CisgICAgICAgIHsK KyAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFt ZXNwYWNlc011dGV4KTsKKyAgICAgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNw YWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQorICAgICAgICAgICAgICAg IGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihj b3BpZWRPcmlnaW4pOworICAgICAgICB9CiAKICAgICAgICAgZm9yIChhdXRvJiB0cmFuc2llbnRM b2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZXMu dmFsdWVzKCkpCiAgICAgICAgICAgICB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmNs ZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4oY29waWVkT3JpZ2luKTsKQEAgLTcxNiwxMiAr NzIyLDE2IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU8KICAgICAg ICAgICAgICAgICB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyQWxsU3RvcmFn ZUFyZWFzKCk7CiAKICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgb3JpZ2luIDogb3JpZ2lu c1RvRGVsZXRlKSB7Ci0gICAgICAgICAgICAgICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCi0gICAgICAgICAgICAg ICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09y aWdpbihvcmlnaW4pOworICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgc3Rk Ojpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXgpOwor ICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1f bG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICAgICAgICAg IGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihv cmlnaW4pOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg ICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJhc2VXaXRoT3Jp Z2luKG9yaWdpbik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRl eCk7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1fbG9j YWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKICAgICAgICAgICAgICAgICBsb2NhbFN0b3Jh Z2VOYW1lc3BhY2UtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CiAgICAgICAgIH0KQEAgLTc0MCw4 ICs3NTAsMTEgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRQogCiAg ICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgY29waWVkT3JpZ2lucyA9IFdURk1vdmUoY29waWVkT3JpZ2lucyksIGNvbXBsZXRpb25IYW5k bGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgIGZv ciAoYXV0byYgb3JpZ2luIDogY29waWVkT3JpZ2lucykgewotICAgICAgICAgICAgZm9yIChhdXRv JiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVz KCkpCi0gICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VB cmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0 ZXgpOworICAgICAgICAgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDog bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQorICAgICAgICAgICAgICAgICAgICBs b2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3Jp Z2luKTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZm9yIChhdXRvJiB0cmFuc2llbnRM b2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZXMu dmFsdWVzKCkpCiAgICAgICAgICAgICAgICAgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNl LT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CkBAIC05OTksNiArMTAx Miw3IEBAIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYSogU3RvcmFnZU1hbmEKIAogU3RvcmFn ZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZSogU3RvcmFnZU1hbmFnZXI6OmdldE9yQ3Jl YXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCkKIHsK KyAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNN dXRleCk7CiAgICAgaWYgKCFtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuaXNWYWxpZEtleShzdG9y YWdlTmFtZXNwYWNlSUQpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIApJbmRleDogU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VN YW5hZ2VyLmgJKHJldmlzaW9uIDI0NjUxNikKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiAr MTA1LDcgQEAgcHJpdmF0ZToKIAogICAgIFJlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXI+IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOwogICAgIEhhc2hNYXA8dWludDY0X3Qs IFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+PiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXM7 CisgICAgTG9jayBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRleDsKIAogICAgIEhhc2hNYXA8 c3RkOjpwYWlyPHVpbnQ2NF90LCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+LCBSZWZQdHI8 VHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlPj4gbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VO YW1lc3BhY2VzOwogCg==