114454 2013-04-11 11:33:41 -0700 Make StorageAreaMap dispatch session storage events 2013-04-11 11:42:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin oldest_to_newest 873999 0 andersca 2013-04-11 11:33:41 -0700 Make StorageAreaMap dispatch session storage events 874000 1 197647 andersca 2013-04-11 11:37:35 -0700 Created attachment 197647 Patch 874001 2 197647 bdakin 2013-04-11 11:40:54 -0700 Comment on attachment 197647 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197647&action=review > Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp:176 > + Storage* storage = frame->document()->domWindow()->optionalSessionStorage(); You could use you document variable here. 874002 3 andersca 2013-04-11 11:42:17 -0700 Committed r148219: <http://trac.webkit.org/changeset/148219> 197647 2013-04-11 11:37:35 -0700 2013-04-11 11:40:54 -0700 Patch bug-114454-20130411113715.patch text/plain 10006 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ0YWEyNGY4ODE3MTk4 MmI1OGFjYjRiOTlhMWNjOTc1NjQxYTcyNS4uZTY2Njg2MzQ0ZjZiM2Y3ODg2Y2U2ZjllZWU0YTcx NzcyOWU0MmUwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA0LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBTdG9yYWdl QXJlYU1hcCBkaXNwYXRjaCBzZXNzaW9uIHN0b3JhZ2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ0NTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvcnQgc3RvcmFnZSBzeW1ib2xzIGFu ZCBoZWFkZXJzIG5lZWRlZCBieSBXZWJLaXQyLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46 CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDEzLTA0 LTExICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCiAg ICAgICAgIGhhbmRsZU1vdXNlTW92ZUV2ZW50IHNob3VsZCBsZXQgaGl0LXRlc3RpbmcgaGl0LXRl c3Qgc2Nyb2xsYmFycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDg1YzFkNWQ3MWZkZmRjYTVkNzcwZjY1MzJjMGVj ZDNkYTQ5NDY1ZGUuLmQxZWU1MGEyMWFhZDU3M2Y3NDc0NjMyY2FmNzdmMTZjZjQ3ZDNmMDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMy0wNC0xMSAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIE1ha2UgU3RvcmFnZUFyZWFNYXAgZGlzcGF0 Y2ggc2Vzc2lvbiBzdG9yYWdlIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3Bw OgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hTdG9yYWdlRXZlbnQp OgorICAgICAgICBEZXBlbmRpbmcgb24gdGhlIHN0b3JhZ2UgYXJlYSB0eXBlLCBjYWxsIGRpc3Bh dGNoU2Vzc2lvblN0b3JhZ2VFdmVudCBvciBkaXNwYXRjaExvY2FsU3RvcmFnZUV2ZW50LgorCisg ICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZl bnQpOgorICAgICAgICBFbnVtZXJhdGUgYWxsIHRoZSBmcmFtZXMgaW4gb3VyIHBhZ2UgYW5kIGRp c3BhdGNoIHRoZSBldmVudCB0byB0aGUgcmVsZXZhbnQgb25lcy4KKworICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudCk6CisgICAgICAgIEFk ZCBlbXB0eSBzdHViIGZvciBub3cuCisKKzIwMTMtMDQtMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBJbXBsZW1lbnQgbW9yZSBsb2dpYyBpbiBTdG9y YWdlQXJlYU1hcAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE0NDUxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggODA1ZTRhODRmZTY0N2NlMTEwYWQx ZDk2M2YzOTEwNzc1ODg3MWRjYi4uYTMyMjkzYWQyODQzN2FiYWEwZjVjODNmZjc0ZDA1MTM3Njc2 NjIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTcwMiw2ICs3MDIsNyBAQCBfX1pON1dlYkNv cmUyMmV4dGVybmFsUmVwcmVzZW50YXRpb25FUE5TXzdFbGVtZW50RWoKIF9fWk43V2ViQ29yZTIy c3lzdGVtTWFya2V0aW5nVmVyc2lvbkV2CiBfX1pON1dlYkNvcmUyMnVzZXJQcmVmZXJyZWRMYW5n dWFnZXNFdgogX19aTjdXZWJDb3JlMjJIVE1MUGx1Z0luSW1hZ2VFbGVtZW50MjlzZXRJc1ByaW1h cnlTbmFwc2hvdHRlZFBsdWdJbkViCitfX1pON1dlYkNvcmUyMlN0b3JhZ2VFdmVudERpc3BhdGNo ZXIzNGRpc3BhdGNoTG9jYWxTdG9yYWdlRXZlbnRzVG9GcmFtZXNFUk5TXzlQYWdlR3JvdXBFUktO M1dURjZWZWN0b3JJTlMzXzZSZWZQdHJJTlNfNUZyYW1lRUVFTG0wRU5TM18xNUNyYXNoT25PdmVy Zmxvd0VFRVJLTlMzXzZTdHJpbmdFU0VfU0VfU0VfUE5TXzE0U2VjdXJpdHlPcmlnaW5FCiBfX1pO N1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlMTRzZXRNYXhpbXVtU2l6ZUV4CiBfX1pO N1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlMTZkZWxldGVBbGxFbnRyaWVzRXYKIF9f Wk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UxNnN0b3JlQ29weU9mQ2FjaGVFUktO M1dURjZTdHJpbmdFUE5TXzIwQXBwbGljYXRpb25DYWNoZUhvc3RFCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYzgyMjQ0MWY3MzBm MDI5YzBhN2I5ZTgzNmYwOGZkNjgzYjAzYTBhMy4uMWFkOWI5ZjM2YjYzYTI3Mzg4OGI3ZDBjMjg5 ZmJkZjJmNTg2OTI3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtNTU3LDYgKzU1Nyw3IEBACiAJCTFBQkM3MTA5MTcwRTVFMUIw MEY5QTlENiAvKiBXb3JrZXJOYXZpZ2F0b3JTdG9yYWdlUXVvdGEuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQkM3MTA4MTcwRTVFMUIwMEY5QTlENiAv KiBXb3JrZXJOYXZpZ2F0b3JTdG9yYWdlUXVvdGEuaCAqLzsgfTsKIAkJMUFDMjI2MEMwREI2OUYx OTAwODlCNjY5IC8qIEpTRE9NQXBwbGljYXRpb25DYWNoZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUMyMjYwQTBEQjY5RjE5MDA4OUI2NjkgLyog SlNET01BcHBsaWNhdGlvbkNhY2hlLmNwcCAqLzsgfTsKIAkJMUFDMjI2MEQwREI2OUYxOTAwODlC NjY5IC8qIEpTRE9NQXBwbGljYXRpb25DYWNoZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUFDMjI2MEIwREI2OUYxOTAwODlCNjY5IC8qIEpTRE9NQXBw bGljYXRpb25DYWNoZS5oICovOyB9OworCQkxQUMyRDg0NTE3MTczNEExMDA2NTJGQzAgLyogU3Rv cmFnZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTFF M0Y5QzQwREEwNTlEQzAwMjUwOTExIC8qIFN0b3JhZ2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklC VVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQUM2OTU5MzE2MUExRTUzMDAzNzMyQ0IgLyog R3JhcGhpY3NMYXllckZhY3RvcnkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBQzY5NTkyMTYxQTFFNTMwMDM3MzJDQiAvKiBHcmFwaGljc0xheWVyRmFj dG9yeS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJ CTFBQ0QxQjYzMEIwMjk3MzkwMDdFNTAxNiAvKiBET01DU1NTdHlsZURlY2xhcmF0aW9uSW50ZXJu YWwuaCBpbiBDb3B5IEdlbmVyYXRlZCBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDg1RTcxMTQ0MEFDNUQ1MzQwMDUzMjcwRiAvKiBET01DU1NTdHlsZURlY2xhcmF0 aW9uSW50ZXJuYWwuaCAqLzsgfTsKIAkJMUFDRTUzREYwQThEMTg4MTAwMjI5NDdEIC8qIEpTRE9N UGFyc2VyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBQ0U1M0REMEE4RDE4ODEwMDIyOTQ3RCAvKiBKU0RPTVBhcnNlci5jcHAgKi87IH07CkBAIC01 MTY4LDcgKzUxNjksNyBAQAogCQlDNUI0QzI0RTE1MDkyMzZDMDBBNkVGMzcgLyogV2ViQ29yZU5T VVJMRXh0cmFzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQzVCNEMyNEMxNTA5MjM2QzAwQTZFRjM3IC8qIFdlYkNvcmVOU1VSTEV4dHJhcy5tbSAqLzsg fTsKIAkJQzVENEFBN0ExMTZCQUZCNjAwNjlDQTkzIC8qIEdseXBoTWV0cmljc01hcC5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzVENEFBNzgxMTZCQUZC NjAwNjlDQTkzIC8qIEdseXBoTWV0cmljc01hcC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVT ID0gKFByaXZhdGUsICk7IH07IH07CiAJCUM1RTlCNjc3MTA2OTdFMTMwMEM3QkIxQSAvKiBTdG9y YWdlRXZlbnREaXNwYXRjaGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEM1RTlCNjc2MTA2OTdFMTMwMEM3QkIxQSAvKiBTdG9yYWdlRXZlbnREaXNw YXRjaGVyLmNwcCAqLzsgfTsKLQkJQzVFQkREODQxMDVFRERFQzAwNTY4MTZGIC8qIFN0b3JhZ2VF dmVudERpc3BhdGNoZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEM1RUJERDgxMTA1RURERUMwMDU2ODE2RiAvKiBTdG9yYWdlRXZlbnREaXNwYXRjaGVy LmggKi87IH07CisJCUM1RUJERDg0MTA1RURERUMwMDU2ODE2RiAvKiBTdG9yYWdlRXZlbnREaXNw YXRjaGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBD NUVCREQ4MTEwNUVEREVDMDA1NjgxNkYgLyogU3RvcmFnZUV2ZW50RGlzcGF0Y2hlci5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUM2NTA0NkE5MTY3 QkZCNTUwMENDMkE0RCAvKiBUZW1wbGF0ZUNvbnRlbnREb2N1bWVudEZyYWdtZW50LmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDNjUwNDZBODE2N0JGQjU1 MDBDQzJBNEQgLyogVGVtcGxhdGVDb250ZW50RG9jdW1lbnRGcmFnbWVudC5oICovOyB9OwogCQlD NkE3MDMzMjVDOUQwQjZDRENCQzRENzcgLyogSlNFdmVudFRhcmdldC5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDNkE3MDMzMjVDOUQwQjZDRENCQzRE NzggLyogSlNFdmVudFRhcmdldC5jcHAgKi87IH07CiAJCUM2QjMxQjJFMTRGODQxRkIwMDg5RjIz RiAvKiBTY3JvbGxiYXJUaGVtZUNsaWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQzY5MTYxNDcxNEY2RUJBNzAwNDYzNzVDIC8qIFNjcm9sbGJhclRo ZW1lQ2xpZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKQEAgLTIzOTUwLDYgKzIzOTUxLDcgQEAKIAkJCQk5N0FBQkQyQjE0RkEwOUQ1MDA3NDU3QUUg LyogV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UuaCBpbiBIZWFkZXJzICovLAogCQkJCTBGNTgw RkEzMTQ5NjkzOTEwMEZCNUJEOCAvKiBXZWJUaWxlZEJhY2tpbmdMYXllci5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJMEZDRjMzMkQwRjJCOUEyNTAwNEI2Nzk1IC8qIFdlYlRpbGVkTGF5ZXIuaCBpbiBI ZWFkZXJzICovLAorCQkJCTFBQzJEODQ1MTcxNzM0QTEwMDY1MkZDMCAvKiBTdG9yYWdlLmggaW4g SGVhZGVycyAqLywKIAkJCQlDRDgyMDMwQTEzOTVBQjZBMDBGOTU2QzYgLyogV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQ0Q4MjAzMEMxMzk1QUI2QTAw Rjk1NkM2IC8qIFdlYlZpZGVvRnVsbHNjcmVlbkhVRFdpbmRvd0NvbnRyb2xsZXIuaCBpbiBIZWFk ZXJzICovLAogCQkJCUYxMjE3MUY2MTZBOENGMEIwMDAwNTNDQSAvKiBXZWJWVFRFbGVtZW50Lmgg aW4gSGVhZGVycyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZUFyZWFNYXAuY3BwCmluZGV4IGFiNTllOWM4YzY3M2E1MTEzM2FjMzljM2NjYjk2 ZjJlNzI5MTRkMjguLjhjODIwNzkyOWViYjZhZDc1NGYyMjdhMmUyODBhNjUyZmVhOTViY2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1h cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh TWFwLmNwcApAQCAtMzEsOCArMzEsMTIgQEAKICNpbmNsdWRlICJTdG9yYWdlQXJlYU1hcE1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSAiU3RvcmFnZU1hbmFnZXJNZXNzYWdlcy5oIgogI2luY2x1ZGUgIlN0 b3JhZ2VOYW1lc3BhY2VJbXBsLmgiCisjaW5jbHVkZSAiV2ViUGFnZS5oIgogI2luY2x1ZGUgIldl YlByb2Nlc3MuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lLmg+CisjaW5jbHVkZSA8V2ViQ29y ZS9QYWdlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlLmg+CisjaW5jbHVkZSA8V2ViQ29y ZS9TdG9yYWdlRXZlbnREaXNwYXRjaGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlTWFw Lmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAtMTQ1LDcgKzE0OSw1NCBAQCB2b2lk IFN0b3JhZ2VBcmVhTWFwOjpkaWRTZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBib29sIHF1b3Rh RXJyb3IpCiAKIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU3RvcmFnZUV2ZW50KHVpbnQ2 NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmlu ZykKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIGlmIChzdG9yYWdlVHlwZSgpID09 IFNlc3Npb25TdG9yYWdlKQorICAgICAgICBkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQoc291 cmNlU3RvcmFnZUFyZWFJRCwga2V5LCBvbGRWYWx1ZSwgbmV3VmFsdWUsIHVybFN0cmluZyk7Cisg ICAgZWxzZQorICAgICAgICBkaXNwYXRjaExvY2FsU3RvcmFnZUV2ZW50KHNvdXJjZVN0b3JhZ2VB cmVhSUQsIGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcpOworfQorCit2b2lkIFN0 b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNl U3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUs IGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQoreworICAg IEFTU0VSVChzdG9yYWdlVHlwZSgpID09IFNlc3Npb25TdG9yYWdlKTsKKworICAgIC8vIE5hbWVz cGFjZSBJRHMgZm9yIHNlc3Npb24gc3RvcmFnZSBuYW1lc3BhY2VzIGFyZSBlcXVpdmFsZW50IHRv IHdlYiBwYWdlIElEcworICAgIC8vIHNvIHdlIGNhbiBnZXQgdGhlIHJpZ2h0IHBhZ2UgaGVyZS4K KyAgICBXZWJQYWdlKiB3ZWJQYWdlID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkud2ViUGFnZShtX3N0 b3JhZ2VOYW1lc3BhY2VJRCk7CisgICAgaWYgKCF3ZWJQYWdlKQorICAgICAgICByZXR1cm47CisK KyAgICBWZWN0b3I8UmVmUHRyPEZyYW1lPiA+IGZyYW1lczsKKworICAgIFBhZ2UqIHBhZ2UgPSB3 ZWJQYWdlLT5jb3JlUGFnZSgpOworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gcGFnZS0+bWFpbkZy YW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZlcnNlTmV4dCgpKSB7Cisg ICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpOworICAgICAgICBp ZiAoIWRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLT5lcXVhbChtX3NlY3VyaXR5T3JpZ2luLmdl dCgpKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIFN0b3JhZ2UqIHN0b3JhZ2Ug PSBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPm9wdGlvbmFsU2Vzc2lvblN0b3JhZ2Uo KTsKKyAgICAgICAgaWYgKCFzdG9yYWdlKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAg ICAgU3RvcmFnZUFyZWFJbXBsKiBzdG9yYWdlQXJlYSA9IHN0YXRpY19jYXN0PFN0b3JhZ2VBcmVh SW1wbCo+KHN0b3JhZ2UtPmFyZWEoKSk7CisgICAgICAgIGlmIChzdG9yYWdlQXJlYS0+c3RvcmFn ZUFyZWFJRCgpID09IHNvdXJjZVN0b3JhZ2VBcmVhSUQpIHsKKyAgICAgICAgICAgIC8vIFRoaXMg aXMgdGhlIHN0b3JhZ2UgYXJlYSB0aGF0IGNhdXNlZCB0aGUgZXZlbnQgdG8gYmUgZGlzcGF0Y2hl ZC4KKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgZnJhbWVzLmFw cGVuZChmcmFtZSk7CisgICAgfQorCisgICAgU3RvcmFnZUV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0 Y2hMb2NhbFN0b3JhZ2VFdmVudHNUb0ZyYW1lcyhwYWdlLT5ncm91cCgpLCBmcmFtZXMsIGtleSwg b2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcsIG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpOwor fQorCit2b2lkIFN0b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaExvY2FsU3RvcmFnZUV2ZW50KHVpbnQ2 NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmlu ZykKK3sKKyAgICBBU1NFUlQoc3RvcmFnZVR5cGUoKSA9PSBMb2NhbFN0b3JhZ2UpOworCisgICAg VU5VU0VEX1BBUkFNKGtleSk7CisgICAgVU5VU0VEX1BBUkFNKG9sZFZhbHVlKTsKKyAgICBVTlVT RURfUEFSQU0obmV3VmFsdWUpOworICAgIFVOVVNFRF9QQVJBTSh1cmxTdHJpbmcpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKaW5kZXggMjViMTRkMjkzZGU5ZjYyOTNkZWNlYTgzODE2 N2E5NjE1Y2YyMDVjNy4uOWQ1NTYwNjUwNmY3ODMwZDkzMGYyNTdmMTM2OTdmZmQ4NjhkODU3ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh TWFwLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh TWFwLmgKQEAgLTY4LDYgKzY4LDkgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbG9hZFZhbHVlc0lm TmVlZGVkKCk7CiAKKyAgICB2b2lkIGRpc3BhdGNoU2Vzc2lvblN0b3JhZ2VFdmVudCh1aW50NjRf dCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBv bGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcp OworICAgIHZvaWQgZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9y YWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29u c3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOworCiAgICAgdWlu dDY0X3QgbV9zdG9yYWdlTWFwSUQ7CiAgICAgdWludDY0X3QgbV9zdG9yYWdlTmFtZXNwYWNlSUQ7 CiAgICAgdW5zaWduZWQgbV9xdW90YUluQnl0ZXM7Cg==