140087 2015-01-05 12:21:38 -0800 Clean up Connection::SyncMessageState 2015-01-05 12:39:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1058759 0 andersca 2015-01-05 12:21:38 -0800 Clean up Connection::SyncMessageState 1058761 1 243986 andersca 2015-01-05 12:28:04 -0800 Created attachment 243986 Patch 1058764 2 243986 kling 2015-01-05 12:38:24 -0800 Comment on attachment 243986 Patch Nice! r=me 1058765 3 andersca 2015-01-05 12:39:36 -0800 Committed r177922: <http://trac.webkit.org/changeset/177922> 243986 2015-01-05 12:28:04 -0800 2015-01-05 12:38:24 -0800 Patch bug-140087-20150105122808.patch text/plain 10469 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWQ5OGJhY2FmNjgzODU3 OWE4ZWU4MzBhMGExOWU5OTI2MTU1YWQ2ZC4uYjQzNGRjOWExZTgyNzA3ZjlhMmM5ZGM4ZDE0ODA5 OTk2OGY3MTAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE1LTAxLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgQ29u bmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMDg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHA6CisgICAgICAg IChJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OnN5bmNNZXNzYWdlU3RhdGVNYXBN dXRleCk6CisgICAgICAgIENoYW5nZSB0aGlzIHRvIHJldHVybiBhbiBzdGQ6Om11dGV4IGFuZCB1 c2Ugc3RkOjpjYWxsX29uY2UgdG8gaW5pdGlhbGl6ZSBpdCBwcm9wZXJseS4KKworICAgICAgICAo SVBDOjpDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpnZXRPckNyZWF0ZSk6CisgICAgICAg IFJldHVybiBhIFJlZi4KKworICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0 YXRlOjp+U3luY01lc3NhZ2VTdGF0ZSk6CisgICAgICAgIFVzZSBhbiBzdGQ6OmxvY2tfZ3VhcmQu CisKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6cHJvY2Vzc0lu Y29taW5nTWVzc2FnZSk6CisgICAgICAgIFJlcGxhY2UgYSBiaW5kIGNhbGwgd2l0aCBhIGxhbWJk YS4KKworICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpkaXNwYXRj aE1lc3NhZ2VzKToKKyAgICAgICAgQ29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZSBub3cgaG9s ZHMgYSBSZWY8Q29ubmVjdGlvbj4uCisKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6U3luY01l c3NhZ2VTdGF0ZTo6ZGlzcGF0Y2hNZXNzYWdlQW5kUmVzZXREaWRTY2hlZHVsZURpc3BhdGNoTWVz c2FnZXNGb3JDb25uZWN0aW9uKToKKyAgICAgICAgQ2hhbmdlIENvbm5lY3Rpb24gdG8gYSByZWZl cmVuY2UuCisKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6cHJvY2Vzc0luY29taW5nTWVzc2Fn ZSk6CisgICAgICAgIENoYW5nZSBDb25uZWN0aW9uIHRvIGEgcmVmZXJlbmNlLgorCisyMDE1LTAx LTA1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQ2xl YW4gdXAgdGhlIHN0b3JhZ2UgbWFuYWdlciBzb21lIG1vcmUKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDA4NgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAKaW5kZXggNjYwOTc0OWQ5MDNlYTBhNzc5MDViYTFmNTM5 MWRkODdlMjYyOTEzMC4uMzU0NjBjYTBhOTI3YWFhYzExNmRhOGNmNTViY2M2NTI0NmU1ZGVmNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcApAQCAtNTcsNyAr NTcsNyBAQCBzdHJ1Y3QgV2FpdEZvck1lc3NhZ2VTdGF0ZSB7CiAKIGNsYXNzIENvbm5lY3Rpb246 OlN5bmNNZXNzYWdlU3RhdGUgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q29ubmVjdGlv bjo6U3luY01lc3NhZ2VTdGF0ZT4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN5 bmNNZXNzYWdlU3RhdGU+IGdldE9yQ3JlYXRlKFJ1bkxvb3AmKTsKKyAgICBzdGF0aWMgUmVmPFN5 bmNNZXNzYWdlU3RhdGU+IGdldE9yQ3JlYXRlKFJ1bkxvb3AmKTsKICAgICB+U3luY01lc3NhZ2VT dGF0ZSgpOwogCiAgICAgdm9pZCB3YWtlVXBDbGllbnRSdW5Mb29wKCkKQEAgLTcyLDcgKzcyLDcg QEAgcHVibGljOgogCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoaXMgbWVzc2FnZSB3aWxsIGJl IGhhbmRsZWQgb24gYSBjbGllbnQgdGhyZWFkIHRoYXQgaXMgY3VycmVudGx5CiAgICAgLy8gd2Fp dGluZyBmb3IgYSByZXBseSB0byBhIHN5bmNocm9ub3VzIG1lc3NhZ2UuCi0gICAgYm9vbCBwcm9j ZXNzSW5jb21pbmdNZXNzYWdlKENvbm5lY3Rpb24qLCBzdGQ6OnVuaXF1ZV9wdHI8TWVzc2FnZURl Y29kZXI+Jik7CisgICAgYm9vbCBwcm9jZXNzSW5jb21pbmdNZXNzYWdlKENvbm5lY3Rpb24mLCBz dGQ6OnVuaXF1ZV9wdHI8TWVzc2FnZURlY29kZXI+Jik7CiAKICAgICAvLyBEaXNwYXRjaCBwZW5k aW5nIHN5bmMgbWVzc2FnZXMuIGlmIGFsbG93ZWRDb25uZWN0aW9uIGlzIG5vdCBudWxsLCB3aWxs IG9ubHkgZGlzcGF0Y2ggbWVzc2FnZXMKICAgICAvLyBmcm9tIHRoYXQgY29ubmVjdGlvbiBhbmQg cHV0IHRoZSBvdGhlciBtZXNzYWdlcyBiYWNrIGluIHRoZSBxdWV1ZS4KQEAgLTg4LDI1ICs4OCwz MCBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gc3luY01lc3NhZ2VTdGF0ZU1hcDsKICAgICB9 CiAKLSAgICBzdGF0aWMgTXV0ZXgmIHN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleCgpCisgICAgc3Rh dGljIHN0ZDo6bXV0ZXgmIHN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleCgpCiAgICAgewotICAgICAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TXV0ZXg+IHN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleDsK KyAgICAgICAgc3RhdGljIExhenlOZXZlckRlc3Ryb3llZDxzdGQ6Om11dGV4PiBzeW5jTWVzc2Fn ZVN0YXRlTWFwTXV0ZXg7CisgICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlRmxhZzsK KyAgICAgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKKyAgICAgICAgICAgIHN5bmNN ZXNzYWdlU3RhdGVNYXBNdXRleC5jb25zdHJ1Y3QoKTsKKyAgICAgICAgfSk7CisKICAgICAgICAg cmV0dXJuIHN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleDsKICAgICB9CiAKLSAgICB2b2lkIGRpc3Bh dGNoTWVzc2FnZUFuZFJlc2V0RGlkU2NoZWR1bGVEaXNwYXRjaE1lc3NhZ2VzRm9yQ29ubmVjdGlv bihDb25uZWN0aW9uKik7CisgICAgdm9pZCBkaXNwYXRjaE1lc3NhZ2VBbmRSZXNldERpZFNjaGVk dWxlRGlzcGF0Y2hNZXNzYWdlc0ZvckNvbm5lY3Rpb24oQ29ubmVjdGlvbiYpOwogCiAgICAgUnVu TG9vcCYgbV9ydW5Mb29wOwogICAgIEJpbmFyeVNlbWFwaG9yZSBtX3dhaXRGb3JTeW5jUmVwbHlT ZW1hcGhvcmU7CiAKICAgICAvLyBQcm90ZWN0cyBtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdl c1dvcmtTZXQgYW5kIG1fbWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5 LgotICAgIE11dGV4IG1fbXV0ZXg7CisgICAgc3RkOjptdXRleCBtX211dGV4OwogCiAgICAgLy8g VGhlIHNldCBvZiBjb25uZWN0aW9ucyBmb3Igd2hpY2ggd2UndmUgc2NoZWR1bGVkIGEgY2FsbCB0 byBkaXNwYXRjaE1lc3NhZ2VBbmRSZXNldERpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc0ZvckNv bm5lY3Rpb24uCiAgICAgSGFzaFNldDxSZWZQdHI8Q29ubmVjdGlvbj4+IG1fZGlkU2NoZWR1bGVE aXNwYXRjaE1lc3NhZ2VzV29ya1NldDsKIAogICAgIHN0cnVjdCBDb25uZWN0aW9uQW5kSW5jb21p bmdNZXNzYWdlIHsKLSAgICAgICAgUmVmUHRyPENvbm5lY3Rpb24+IGNvbm5lY3Rpb247CisgICAg ICAgIFJlZjxDb25uZWN0aW9uPiBjb25uZWN0aW9uOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8 TWVzc2FnZURlY29kZXI+IG1lc3NhZ2U7CiAgICAgfTsKICAgICBWZWN0b3I8Q29ubmVjdGlvbkFu ZEluY29taW5nTWVzc2FnZT4gbV9tZXNzYWdlc1RvRGlzcGF0Y2hXaGlsZVdhaXRpbmdGb3JTeW5j UmVwbHk7CkBAIC0xMjEsMjAgKzEyNiwxOCBAQCBwdWJsaWM6CiB9OwogCiAKLVBhc3NSZWZQdHI8 Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZT4gQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0 ZTo6Z2V0T3JDcmVhdGUoUnVuTG9vcCYgcnVuTG9vcCkKK1JlZjxDb25uZWN0aW9uOjpTeW5jTWVz c2FnZVN0YXRlPiBDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpnZXRPckNyZWF0ZShSdW5M b29wJiBydW5Mb29wKQogewotICAgIE11dGV4TG9ja2VyIGxvY2tlcihzeW5jTWVzc2FnZVN0YXRl TWFwTXV0ZXgoKSk7Ci0gICAgU3luY01lc3NhZ2VTdGF0ZU1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9 IHN5bmNNZXNzYWdlU3RhdGVNYXAoKS5hZGQoJnJ1bkxvb3AsIG51bGxwdHIpOworICAgIHN0ZDo6 bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKHN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleCgpKTsK IAotICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKLSAgICAgICAgQVNTRVJUKHJlc3VsdC5p dGVyYXRvci0+dmFsdWUpOwotICAgICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsK LSAgICB9CisgICAgYXV0byYgc2xvdCA9IHN5bmNNZXNzYWdlU3RhdGVNYXAoKS5hZGQoJnJ1bkxv b3AsIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKKyAgICBpZiAoc2xvdCkKKyAgICAgICAgcmV0 dXJuICpzbG90OwogCi0gICAgUmVmUHRyPFN5bmNNZXNzYWdlU3RhdGU+IHN5bmNNZXNzYWdlU3Rh dGUgPSBhZG9wdFJlZihuZXcgU3luY01lc3NhZ2VTdGF0ZShydW5Mb29wKSk7Ci0gICAgcmVzdWx0 Lml0ZXJhdG9yLT52YWx1ZSA9IHN5bmNNZXNzYWdlU3RhdGUuZ2V0KCk7CisgICAgUmVmPFN5bmNN ZXNzYWdlU3RhdGU+IHN5bmNNZXNzYWdlU3RhdGUgPSBhZG9wdFJlZigqbmV3IFN5bmNNZXNzYWdl U3RhdGUocnVuTG9vcCkpOworICAgIHNsb3QgPSBzeW5jTWVzc2FnZVN0YXRlLnB0cigpOwogCi0g ICAgcmV0dXJuIHN5bmNNZXNzYWdlU3RhdGUucmVsZWFzZSgpOworICAgIHJldHVybiBzeW5jTWVz c2FnZVN0YXRlOwogfQogCiBDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2Fn ZVN0YXRlKFJ1bkxvb3AmIHJ1bkxvb3ApCkBAIC0xNDQsMjggKzE0NywzMCBAQCBDb25uZWN0aW9u OjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2FnZVN0YXRlKFJ1bkxvb3AmIHJ1bkxvb3ApCiAK IENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6On5TeW5jTWVzc2FnZVN0YXRlKCkKIHsKLSAg ICBNdXRleExvY2tlciBsb2NrZXIoc3luY01lc3NhZ2VTdGF0ZU1hcE11dGV4KCkpOwotICAgIAor ICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKHN5bmNNZXNzYWdlU3RhdGVNYXBN dXRleCgpKTsKKwogICAgIEFTU0VSVChzeW5jTWVzc2FnZVN0YXRlTWFwKCkuY29udGFpbnMoJm1f cnVuTG9vcCkpOwogICAgIHN5bmNNZXNzYWdlU3RhdGVNYXAoKS5yZW1vdmUoJm1fcnVuTG9vcCk7 CiAKICAgICBBU1NFUlQobV9tZXNzYWdlc1RvRGlzcGF0Y2hXaGlsZVdhaXRpbmdGb3JTeW5jUmVw bHkuaXNFbXB0eSgpKTsKIH0KIAotYm9vbCBDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpw cm9jZXNzSW5jb21pbmdNZXNzYWdlKENvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHN0ZDo6dW5pcXVl X3B0cjxNZXNzYWdlRGVjb2Rlcj4mIG1lc3NhZ2UpCitib29sIENvbm5lY3Rpb246OlN5bmNNZXNz YWdlU3RhdGU6OnByb2Nlc3NJbmNvbWluZ01lc3NhZ2UoQ29ubmVjdGlvbiYgY29ubmVjdGlvbiwg c3RkOjp1bmlxdWVfcHRyPE1lc3NhZ2VEZWNvZGVyPiYgbWVzc2FnZSkKIHsKICAgICBpZiAoIW1l c3NhZ2UtPnNob3VsZERpc3BhdGNoTWVzc2FnZVdoZW5XYWl0aW5nRm9yU3luY1JlcGx5KCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIENvbm5lY3Rpb25BbmRJbmNvbWluZ01lc3NhZ2Ug Y29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZTsKLSAgICBjb25uZWN0aW9uQW5kSW5jb21pbmdN ZXNzYWdlLmNvbm5lY3Rpb24gPSBjb25uZWN0aW9uOwotICAgIGNvbm5lY3Rpb25BbmRJbmNvbWlu Z01lc3NhZ2UubWVzc2FnZSA9IFdURjo6bW92ZShtZXNzYWdlKTsKKyAgICBDb25uZWN0aW9uQW5k SW5jb21pbmdNZXNzYWdlIGNvbm5lY3Rpb25BbmRJbmNvbWluZ01lc3NhZ2UgeyBjb25uZWN0aW9u LCBXVEY6Om1vdmUobWVzc2FnZSkgfTsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9j a2VyKG1fbXV0ZXgpOworICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayht X211dGV4KTsKICAgICAgICAgCi0gICAgICAgIGlmIChtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNz YWdlc1dvcmtTZXQuYWRkKGNvbm5lY3Rpb24pLmlzTmV3RW50cnkpCi0gICAgICAgICAgICBtX3J1 bkxvb3AuZGlzcGF0Y2goYmluZCgmU3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGF0Y2hNZXNzYWdlQW5k UmVzZXREaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNGb3JDb25uZWN0aW9uLCB0aGlzLCBSZWZQ dHI8Q29ubmVjdGlvbj4oY29ubmVjdGlvbikpKTsKKyAgICAgICAgaWYgKG1fZGlkU2NoZWR1bGVE aXNwYXRjaE1lc3NhZ2VzV29ya1NldC5hZGQoJmNvbm5lY3Rpb24pLmlzTmV3RW50cnkpIHsKKyAg ICAgICAgICAgIFJlZlB0cjxDb25uZWN0aW9uPiBwcm90ZWN0ZWRDb25uZWN0aW9uKCZjb25uZWN0 aW9uKTsKKyAgICAgICAgICAgIG1fcnVuTG9vcC5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkQ29u bmVjdGlvbl0geworICAgICAgICAgICAgICAgIGRpc3BhdGNoTWVzc2FnZUFuZFJlc2V0RGlkU2No ZWR1bGVEaXNwYXRjaE1lc3NhZ2VzRm9yQ29ubmVjdGlvbigqcHJvdGVjdGVkQ29ubmVjdGlvbik7 CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQogCiAgICAgICAgIG1fbWVzc2FnZXNUb0Rpc3Bh dGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LmFwcGVuZChXVEY6Om1vdmUoY29ubmVjdGlvbkFu ZEluY29taW5nTWVzc2FnZSkpOwogICAgIH0KQEAgLTE4Miw3ICsxODcsNyBAQCB2b2lkIENvbm5l Y3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmRpc3BhdGNoTWVzc2FnZXMoQ29ubmVjdGlvbiogYWxs b3dlZENvbm5lY3RpbwogICAgIFZlY3RvcjxDb25uZWN0aW9uQW5kSW5jb21pbmdNZXNzYWdlPiBt ZXNzYWdlc1RvRGlzcGF0Y2hXaGlsZVdhaXRpbmdGb3JTeW5jUmVwbHk7CiAKICAgICB7Ci0gICAg ICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211dGV4KTsKKyAgICAgICAgc3RkOjpsb2NrX2d1YXJk PHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7CiAgICAgICAgIG1fbWVzc2FnZXNUb0Rpc3BhdGNo V2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LnN3YXAobWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0 aW5nRm9yU3luY1JlcGx5KTsKICAgICB9CiAKQEAgLTE5MSw3ICsxOTYsNyBAQCB2b2lkIENvbm5l Y3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmRpc3BhdGNoTWVzc2FnZXMoQ29ubmVjdGlvbiogYWxs b3dlZENvbm5lY3RpbwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWVzc2FnZXNUb0Rpc3Bh dGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LnNpemUoKTsgKytpKSB7CiAgICAgICAgIENvbm5l Y3Rpb25BbmRJbmNvbWluZ01lc3NhZ2UmIGNvbm5lY3Rpb25BbmRJbmNvbWluZ01lc3NhZ2UgPSBt ZXNzYWdlc1RvRGlzcGF0Y2hXaGlsZVdhaXRpbmdGb3JTeW5jUmVwbHlbaV07CiAKLSAgICAgICAg aWYgKGFsbG93ZWRDb25uZWN0aW9uICYmIGFsbG93ZWRDb25uZWN0aW9uICE9IGNvbm5lY3Rpb25B bmRJbmNvbWluZ01lc3NhZ2UuY29ubmVjdGlvbikgeworICAgICAgICBpZiAoYWxsb3dlZENvbm5l Y3Rpb24gJiYgYWxsb3dlZENvbm5lY3Rpb24gIT0gY29ubmVjdGlvbkFuZEluY29taW5nTWVzc2Fn ZS5jb25uZWN0aW9uLnB0cigpKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGluY29taW5nIG1lc3Nh Z2UgYmVsb25ncyB0byBhbm90aGVyIGNvbm5lY3Rpb24gYW5kIHdlIGRvbid0IHdhbnQgdG8gZGlz cGF0Y2ggaXQgbm93CiAgICAgICAgICAgICAvLyBzbyBtYXJrIGl0IHRvIGJlIHB1dCBiYWNrIGlu IHRoZSBtZXNzYWdlIHF1ZXVlLgogICAgICAgICAgICAgbWVzc2FnZXNUb1B1dEJhY2suYXBwZW5k KFdURjo6bW92ZShjb25uZWN0aW9uQW5kSW5jb21pbmdNZXNzYWdlKSk7CkBAIC0yMDIsMjIgKzIw NywyMiBAQCB2b2lkIENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmRpc3BhdGNoTWVzc2Fn ZXMoQ29ubmVjdGlvbiogYWxsb3dlZENvbm5lY3RpbwogICAgIH0KIAogICAgIGlmICghbWVzc2Fn ZXNUb1B1dEJhY2suaXNFbXB0eSgpKSB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211 dGV4KTsKKyAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7 CiAKICAgICAgICAgZm9yIChhdXRvJiBtZXNzYWdlIDogbWVzc2FnZXNUb1B1dEJhY2spCiAgICAg ICAgICAgICBtX21lc3NhZ2VzVG9EaXNwYXRjaFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBseS5hcHBl bmQoV1RGOjptb3ZlKG1lc3NhZ2UpKTsKICAgICB9CiB9CiAKLXZvaWQgQ29ubmVjdGlvbjo6U3lu Y01lc3NhZ2VTdGF0ZTo6ZGlzcGF0Y2hNZXNzYWdlQW5kUmVzZXREaWRTY2hlZHVsZURpc3BhdGNo TWVzc2FnZXNGb3JDb25uZWN0aW9uKENvbm5lY3Rpb24qIGNvbm5lY3Rpb24pCit2b2lkIENvbm5l Y3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmRpc3BhdGNoTWVzc2FnZUFuZFJlc2V0RGlkU2NoZWR1 bGVEaXNwYXRjaE1lc3NhZ2VzRm9yQ29ubmVjdGlvbihDb25uZWN0aW9uJiBjb25uZWN0aW9uKQog ewogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbXV0ZXgpOwotICAgICAgICBB U1NFUlQobV9kaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrU2V0LmNvbnRhaW5zKGNvbm5l Y3Rpb24pKTsKLSAgICAgICAgbV9kaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrU2V0LnJl bW92ZShjb25uZWN0aW9uKTsKKyAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxv Y2sobV9tdXRleCk7CisgICAgICAgIEFTU0VSVChtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdl c1dvcmtTZXQuY29udGFpbnMoJmNvbm5lY3Rpb24pKTsKKyAgICAgICAgbV9kaWRTY2hlZHVsZURp c3BhdGNoTWVzc2FnZXNXb3JrU2V0LnJlbW92ZSgmY29ubmVjdGlvbik7CiAgICAgfQogCi0gICAg ZGlzcGF0Y2hNZXNzYWdlcyhjb25uZWN0aW9uKTsKKyAgICBkaXNwYXRjaE1lc3NhZ2VzKCZjb25u ZWN0aW9uKTsKIH0KIAogUGFzc1JlZlB0cjxDb25uZWN0aW9uPiBDb25uZWN0aW9uOjpjcmVhdGVT ZXJ2ZXJDb25uZWN0aW9uKElkZW50aWZpZXIgaWRlbnRpZmllciwgQ2xpZW50KiBjbGllbnQsIFJ1 bkxvb3AmIGNsaWVudFJ1bkxvb3ApCkBAIC01MzQsNyArNTM5LDcgQEAgc3RkOjp1bmlxdWVfcHRy PE1lc3NhZ2VEZWNvZGVyPiBDb25uZWN0aW9uOjp3YWl0Rm9yU3luY1JlcGx5KHVpbnQ2NF90IHN5 bmNSZXF1ZXMKICAgICBib29sIHRpbWVkT3V0ID0gZmFsc2U7CiAgICAgd2hpbGUgKCF0aW1lZE91 dCkgewogICAgICAgICAvLyBGaXJzdCwgY2hlY2sgaWYgd2UgaGF2ZSBhbnkgbWVzc2FnZXMgdGhh dCB3ZSBuZWVkIHRvIHByb2Nlc3MuCi0gICAgICAgIG1fc3luY01lc3NhZ2VTdGF0ZS0+ZGlzcGF0 Y2hNZXNzYWdlcygwKTsKKyAgICAgICAgbV9zeW5jTWVzc2FnZVN0YXRlLT5kaXNwYXRjaE1lc3Nh Z2VzKG51bGxwdHIpOwogICAgICAgICAKICAgICAgICAgewogICAgICAgICAgICAgTXV0ZXhMb2Nr ZXIgbG9ja2VyKG1fc3luY1JlcGx5U3RhdGVNdXRleCk7CkBAIC02NTIsNyArNjU3LDcgQEAgdm9p ZCBDb25uZWN0aW9uOjpwcm9jZXNzSW5jb21pbmdNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxNZXNz YWdlRGVjb2Rlcj4gbWVzc2FnZSkKICAgICAvLyBDaGVjayBpZiB0aGlzIGlzIGEgc3luYyBtZXNz YWdlIG9yIGlmIGl0J3MgYSBtZXNzYWdlIHRoYXQgc2hvdWxkIGJlIGRpc3BhdGNoZWQgZXZlbiB3 aGVuIHdhaXRpbmcgZm9yCiAgICAgLy8gYSBzeW5jIHJlcGx5LiBJZiBpdCBpcywgYW5kIHdlJ3Jl IHdhaXRpbmcgZm9yIGEgc3luYyByZXBseSB0aGlzIG1lc3NhZ2UgbmVlZHMgdG8gYmUgZGlzcGF0 Y2hlZC4KICAgICAvLyBJZiB3ZSBkb24ndCB3ZSdsbCBlbmQgdXAgd2l0aCBhIGRlYWRsb2NrIHdo ZXJlIGJvdGggc3luYyBtZXNzYWdlIHNlbmRlcnMgYXJlIHN0dWNrIHdhaXRpbmcgZm9yIGEgcmVw bHkuCi0gICAgaWYgKG1fc3luY01lc3NhZ2VTdGF0ZS0+cHJvY2Vzc0luY29taW5nTWVzc2FnZSh0 aGlzLCBtZXNzYWdlKSkKKyAgICBpZiAobV9zeW5jTWVzc2FnZVN0YXRlLT5wcm9jZXNzSW5jb21p bmdNZXNzYWdlKCp0aGlzLCBtZXNzYWdlKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gQ2hl Y2sgaWYgd2UncmUgd2FpdGluZyBmb3IgdGhpcyBtZXNzYWdlLgo=