115676 2013-05-06 14:18:24 -0700 Move local storage directory handling to LocalStorageDatabaseTracker 2013-05-06 14:42:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 885382 0 andersca 2013-05-06 14:18:24 -0700 Move local storage directory handling to LocalStorageDatabaseTracker 885387 1 200811 andersca 2013-05-06 14:19:59 -0700 Created attachment 200811 Patch 885398 2 andersca 2013-05-06 14:42:25 -0700 Committed r149643: <http://trac.webkit.org/changeset/149643> 200811 2013-05-06 14:19:59 -0700 2013-05-06 14:24:22 -0700 Patch bug-115676-20130506141906.patch text/plain 12344 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzFiOGZjZjM4ZGQ0YTg0 ZmY5ZDUzYTMwZDVjNmQ1ZjcwNmUzYTI0My4uNWMzZDg4NjJlOWVkNDU4OGZiZTQ0NDhhM2JlZDRi NTlkMzllYTIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEzLTA1LTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBsb2NhbCBz dG9yYWdlIGRpcmVjdG9yeSBoYW5kbGluZyB0byBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTY3Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9j ZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpM b2NhbFN0b3JhZ2VEYXRhYmFzZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9y YWdlRGF0YWJhc2U6OkxvY2FsU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv U3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChMb2NhbFN0b3JhZ2VEYXRhYmFzZSk6CisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2Uv TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyOjpzZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpkYXRhYmFzZUZpbGVuYW1lKToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyOjpzZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnlJbnRlcm5hbCk6CisgICAgICAgICog VUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmg6CisgICAgICAg IChXZWJDb3JlKToKKyAgICAgICAgKExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcik6CisgICAg ICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VBcmVhKToKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OnNldExvY2FsU3RvcmFnZURpcmVjdG9yeSk6CisgICAg ICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKyAgICAgICAgKFN0b3Jh Z2VNYW5hZ2VyKToKKworMjAxMy0wNS0wNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIEV2ZXJ5IExvY2FsU3RvcmFnZURhdGFiYXNlIHNob3VsZCBrbm93 IGFib3V0IGl0cyB0cmFja2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTU2NzMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwCmluZGV4IDlhOWM1ZjM4MThkMTdj NjlhN2JhYzVkMWQwNThiYmM4ZmMzNGIzMTEuLjgzYjI3MWNiNWU4MzgxMjZmYTEzYWM2NzMwMGEz N2I5MjJiNGE3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdl L0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv U3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKQEAgLTQ0LDE1ICs0NCwxNSBAQCBzdGF0 aWMgY29uc3QgaW50IG1heGltdW1JdGVtc1RvVXBkYXRlID0gMTAwOwogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAotUGFzc1JlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZT4gTG9jYWxTdG9yYWdlRGF0 YWJhc2U6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGRhdGFiYXNlRmlsZW5hbWUsIFBhc3NSZWZQdHI8 V29ya1F1ZXVlPiBxdWV1ZSwgUGFzc1JlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+ IHRyYWNrZXIpCitQYXNzUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlPiBMb2NhbFN0b3JhZ2VE YXRhYmFzZTo6Y3JlYXRlKFBhc3NSZWZQdHI8V29ya1F1ZXVlPiBxdWV1ZSwgUGFzc1JlZlB0cjxM b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+IHRyYWNrZXIsIFNlY3VyaXR5T3JpZ2luKiBzZWN1 cml0eU9yaWdpbikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IExvY2FsU3RvcmFnZURhdGFi YXNlKGRhdGFiYXNlRmlsZW5hbWUsIHF1ZXVlLCB0cmFja2VyKSk7CisgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyBMb2NhbFN0b3JhZ2VEYXRhYmFzZShxdWV1ZSwgdHJhY2tlciwgc2VjdXJpdHlPcmln aW4pKTsKIH0KIAotTG9jYWxTdG9yYWdlRGF0YWJhc2U6OkxvY2FsU3RvcmFnZURhdGFiYXNlKGNv bnN0IFN0cmluZyYgZGF0YWJhc2VGaWxlbmFtZSwgUGFzc1JlZlB0cjxXb3JrUXVldWU+IHF1ZXVl LCBQYXNzUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcj4gdHJhY2tlcikKLSAgICA6 IG1fZGF0YWJhc2VGaWxlbmFtZShkYXRhYmFzZUZpbGVuYW1lKQotICAgICwgbV9xdWV1ZShxdWV1 ZSkKK0xvY2FsU3RvcmFnZURhdGFiYXNlOjpMb2NhbFN0b3JhZ2VEYXRhYmFzZShQYXNzUmVmUHRy PFdvcmtRdWV1ZT4gcXVldWUsIFBhc3NSZWZQdHI8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy PiB0cmFja2VyLCBTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4pCisgICAgOiBtX3F1ZXVl KHF1ZXVlKQogICAgICwgbV90cmFja2VyKHRyYWNrZXIpCisgICAgLCBtX2RhdGFiYXNlRmlsZW5h bWUobV90cmFja2VyLT5kYXRhYmFzZUZpbGVuYW1lKHNlY3VyaXR5T3JpZ2luKSkKICAgICAsIG1f ZmFpbGVkVG9PcGVuRGF0YWJhc2UoZmFsc2UpCiAgICAgLCBtX2RpZEltcG9ydEl0ZW1zKGZhbHNl KQogICAgICwgbV9pc0Nsb3NlZChmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oCmluZGV4IGI1NDFiNDc2NjEx NTZmNWEzNjg0ZDIwNjI0YmJkYzgxNzE3ZDQwMDMuLjJhZDcxZjVhZTI0Yjg5M2NjY2UwOTY5ZTk5 YTQyMDIyMGE5YWVlYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9y YWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuaApAQCAtMzUsNiArMzUsNyBAQAogY2xhc3Mg V29ya1F1ZXVlOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBTZWN1cml0eU9yaWdpbjsK IGNsYXNzIFN0b3JhZ2VNYXA7CiB9CiAKQEAgLTQ0LDcgKzQ1LDcgQEAgY2xhc3MgTG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyOwogCiBjbGFzcyBMb2NhbFN0b3JhZ2VEYXRhYmFzZSA6IHB1Ymxp YyBUaHJlYWRTYWZlUmVmQ291bnRlZDxMb2NhbFN0b3JhZ2VEYXRhYmFzZT4gewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlPiBjcmVhdGUoY29uc3Qg U3RyaW5nJiBkYXRhYmFzZUZpbGVuYW1lLCBQYXNzUmVmUHRyPFdvcmtRdWV1ZT4sIFBhc3NSZWZQ dHI8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyPik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8 TG9jYWxTdG9yYWdlRGF0YWJhc2U+IGNyZWF0ZShQYXNzUmVmUHRyPFdvcmtRdWV1ZT4sIFBhc3NS ZWZQdHI8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyPiwgV2ViQ29yZTo6U2VjdXJpdHlPcmln aW4qKTsKICAgICB+TG9jYWxTdG9yYWdlRGF0YWJhc2UoKTsKIAogICAgIC8vIFdpbGwgYmxvY2sg dW50aWwgdGhlIGltcG9ydCBpcyBjb21wbGV0ZS4KQEAgLTU4LDcgKzU5LDcgQEAgcHVibGljOgog ICAgIHZvaWQgY2xvc2UoKTsKIAogcHJpdmF0ZToKLSAgICBMb2NhbFN0b3JhZ2VEYXRhYmFzZShj b25zdCBTdHJpbmcmIGRhdGFiYXNlRmlsZW5hbWUsIFBhc3NSZWZQdHI8V29ya1F1ZXVlPiwgUGFz c1JlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+KTsKKyAgICBMb2NhbFN0b3JhZ2VE YXRhYmFzZShQYXNzUmVmUHRyPFdvcmtRdWV1ZT4sIFBhc3NSZWZQdHI8TG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyPiwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKIAogICAgIGVudW0gRGF0 YWJhc2VPcGVuaW5nU3RyYXRlZ3kgewogICAgICAgICBDcmVhdGVJZk5vbkV4aXN0ZW50LApAQCAt NzUsMTAgKzc2LDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVEYXRhYmFzZSgpOwogICAg IHZvaWQgdXBkYXRlRGF0YWJhc2VXaXRoQ2hhbmdlZEl0ZW1zKGNvbnN0IEhhc2hNYXA8U3RyaW5n LCBTdHJpbmc+Jik7CiAKLSAgICBTdHJpbmcgbV9kYXRhYmFzZUZpbGVuYW1lOwogICAgIFJlZlB0 cjxXb3JrUXVldWU+IG1fcXVldWU7CiAgICAgUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlcj4gbV90cmFja2VyOwogCisgICAgU3RyaW5nIG1fZGF0YWJhc2VGaWxlbmFtZTsKICAgICBX ZWJDb3JlOjpTUUxpdGVEYXRhYmFzZSBtX2RhdGFiYXNlOwogICAgIGJvb2wgbV9mYWlsZWRUb09w ZW5EYXRhYmFzZTsKICAgICBib29sIG1fZGlkSW1wb3J0SXRlbXM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLmNwcAppbmRleCAxODgxZTg0MzAwNGU4NmNmMDM0OTVmNWM4OGM2YWZiMjQ1MzM3 ZmU4Li5jYjBlOWExZGQ0ZWFiZGQ5YmE3ZWE3YWViOTAzNTA3NjFiYzg0NDIxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRy YWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlci5jcHAKQEAgLTI3LDYgKzI3LDExIEBACiAjaW5jbHVkZSAiTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgiCiAKICNpbmNsdWRlICJXb3JrUXVldWUuaCIKKyNp bmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5 T3JpZ2luLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgorCit1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTQ0LDQgKzQ5LDI0IEBAIExv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6fkxvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcigp CiB7CiB9CiAKK3ZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpzZXRMb2NhbFN0b3Jh Z2VEaXJlY3RvcnkoY29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpCit7CisgICAg bV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpzZXRM b2NhbFN0b3JhZ2VEaXJlY3RvcnlJbnRlcm5hbCwgdGhpcywgbG9jYWxTdG9yYWdlRGlyZWN0b3J5 Lmlzb2xhdGVkQ29weSgpKSk7Cit9CisKK1N0cmluZyBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXI6OmRhdGFiYXNlRmlsZW5hbWUoU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKSBjb25z dAoreworICAgIGlmICghbWFrZUFsbERpcmVjdG9yaWVzKG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5 KSkgeworICAgICAgICBMT0dfRVJST1IoIlVuYWJsZWQgdG8gY3JlYXRlIExvY2FsU3RvcmFnZSBk YXRhYmFzZSBwYXRoICVzIiwgbV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkudXRmOCgpLmRhdGEoKSk7 CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICB9CisKKyAgICByZXR1cm4gcGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5LCBzZWN1cml0eU9yaWdpbi0+ ZGF0YWJhc2VJZGVudGlmaWVyKCkgKyAiLmxvY2Fsc3RvcmFnZSIpOworfQorCit2b2lkIExvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5SW50ZXJuYWwo Y29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpCit7CisgICAgbV9sb2NhbFN0b3Jh Z2VEaXJlY3RvcnkgPSBsb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAppbmRleCBlMmZhODFkZjRhNDg0YmQ1 Mjc5MWZmNWNkYTM2OTViOWUwZmMxZGY0Li45ZmQ5NTY4ZTU2NjUyMWY2MjA3M2I3ZGI2YjQ0OTg1 ZmFlYTRkNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9M b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaApAQCAtMjksNiArMjksMTEg QEAKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4K ICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgU2VjdXJpdHlPcmln aW47Cit9CiAKIGNsYXNzIFdvcmtRdWV1ZTsKIApAQCAtMzksMTAgKzQ0LDE3IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+IGNyZWF0 ZShQYXNzUmVmUHRyPFdvcmtRdWV1ZT4pOwogICAgIH5Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIoKTsKIAorICAgIHZvaWQgc2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYp OworICAgIFN0cmluZyBkYXRhYmFzZUZpbGVuYW1lKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKikg Y29uc3Q7CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFj a2VyKFBhc3NSZWZQdHI8V29ya1F1ZXVlPik7CiAKKyAgICB2b2lkIHNldExvY2FsU3RvcmFnZURp cmVjdG9yeUludGVybmFsKGNvbnN0IFN0cmluZyYpOworCiAgICAgUmVmUHRyPFdvcmtRdWV1ZT4g bV9xdWV1ZTsKKworICAgIFN0cmluZyBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDU4ZTM4MTQ2NjczODA2YWEwZTQ5NmM5NDky ZjA4YTNlZjhjYzkzMGIuLmM2NWU4Yjc2NjgzYmNjOTNhOWRlODE2Nzk2ZDYzZjMzYzZiYmVlNzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5h Z2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFu YWdlci5jcHAKQEAgLTMzLDcgKzMzLDYgQEAKICNpbmNsdWRlICJTdG9yYWdlTWFuYWdlck1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSAiV29ya1F1ZXVl LmgiCi0jaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9T ZWN1cml0eU9yaWdpbkhhc2guaD4KICNpbmNsdWRlIDxXZWJDb3JlL1N0b3JhZ2VNYXAuaD4KIApA QCAtODMsNyArODIsNiBAQCBwdWJsaWM6CiAgICAgfkxvY2FsU3RvcmFnZU5hbWVzcGFjZSgpOwog CiAgICAgU3RvcmFnZU1hbmFnZXIqIHN0b3JhZ2VNYW5hZ2VyKCkgY29uc3QgeyByZXR1cm4gbV9z dG9yYWdlTWFuYWdlcjsgfQotICAgIFN0cmluZyBkYXRhYmFzZUZpbGVuYW1lKFNlY3VyaXR5T3Jp Z2luKikgY29uc3Q7CiAKICAgICBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBnZXRPckNyZWF0ZVN0 b3JhZ2VBcmVhKFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+KTsKICAgICB2b2lkIGRpZERlc3Ry b3lTdG9yYWdlQXJlYShTdG9yYWdlQXJlYSopOwpAQCAtMTExLDcgKzEwOSw3IEBAIFN0b3JhZ2VN YW5hZ2VyOjpTdG9yYWdlQXJlYTo6U3RvcmFnZUFyZWEoTG9jYWxTdG9yYWdlTmFtZXNwYWNlKiBs b2NhbFN0b3JhZ2VOYW1lCiAgICAgLCBtX3N0b3JhZ2VNYXAoU3RvcmFnZU1hcDo6Y3JlYXRlKG1f cXVvdGFJbkJ5dGVzKSkKIHsKICAgICBpZiAobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UpCi0gICAg ICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJhc2UgPSBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6Y3JlYXRl KG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5kYXRhYmFzZUZpbGVuYW1lKG1fc2VjdXJpdHlPcmln aW4uZ2V0KCkpLCBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9x dWV1ZSwgbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VNYW5hZ2VyKCktPm1fbG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyKTsKKyAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZSA9 IExvY2FsU3RvcmFnZURhdGFiYXNlOjpjcmVhdGUobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPnN0 b3JhZ2VNYW5hZ2VyKCktPm1fcXVldWUsIG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5zdG9yYWdl TWFuYWdlcigpLT5tX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlciwgbV9zZWN1cml0eU9yaWdp bi5nZXQoKSk7CiB9CiAKIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6flN0b3JhZ2VBcmVh KCkKQEAgLTI0MiwxNiArMjQwLDYgQEAgU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVz cGFjZTo6fkxvY2FsU3RvcmFnZU5hbWVzcGFjZSgpCiAgICAgQVNTRVJUKG1fc3RvcmFnZUFyZWFN YXAuaXNFbXB0eSgpKTsKIH0KIAotU3RyaW5nIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VO YW1lc3BhY2U6OmRhdGFiYXNlRmlsZW5hbWUoU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2lu KSBjb25zdAotewotICAgIGlmICghbWFrZUFsbERpcmVjdG9yaWVzKG1fc3RvcmFnZU1hbmFnZXIt Pm1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5KSkgewotICAgICAgICBMT0dfRVJST1IoIlVuYWJsZWQg dG8gY3JlYXRlIExvY2FsU3RvcmFnZSBkYXRhYmFzZSBwYXRoICVzIiwgbV9zdG9yYWdlTWFuYWdl ci0+bV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIHJldHVy biBTdHJpbmcoKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50 KG1fc3RvcmFnZU1hbmFnZXItPm1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5LCBzZWN1cml0eU9yaWdp bi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkgKyAiLmxvY2Fsc3RvcmFnZSIpOwotfQotCiBQYXNzUmVm UHRyPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3Rv cmFnZU5hbWVzcGFjZTo6Z2V0T3JDcmVhdGVTdG9yYWdlQXJlYShQYXNzUmVmUHRyPFNlY3VyaXR5 T3JpZ2luPiBzZWN1cml0eU9yaWdpbikKIHsKICAgICBIYXNoTWFwPFJlZlB0cjxTZWN1cml0eU9y aWdpbj4sIFN0b3JhZ2VBcmVhKj46OkFkZFJlc3VsdCByZXN1bHQgPSBtX3N0b3JhZ2VBcmVhTWFw LmFkZChzZWN1cml0eU9yaWdpbiwgMCk7CkBAIC0zNTUsNyArMzQzLDcgQEAgU3RvcmFnZU1hbmFn ZXI6On5TdG9yYWdlTWFuYWdlcigpCiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OnNldExvY2FsU3Rv cmFnZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSkKIHsKLSAg ICBtX3F1ZXVlLT5kaXNwYXRjaChiaW5kKCZTdG9yYWdlTWFuYWdlcjo6c2V0TG9jYWxTdG9yYWdl RGlyZWN0b3J5SW50ZXJuYWwsIHRoaXMsIGxvY2FsU3RvcmFnZURpcmVjdG9yeS5pc29sYXRlZENv cHkoKSkpOworICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5zZXRMb2NhbFN0b3Jh Z2VEaXJlY3RvcnkobG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKIH0KIAogdm9pZCBTdG9yYWdlTWFu YWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3Qgc3RvcmFnZU5hbWVz cGFjZUlELCBDb3JlSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbiwgdW5zaWduZWQg cXVvdGFJbkJ5dGVzKQpAQCAtNDk5LDExICs0ODcsNiBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpj bGVhcihDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdlTWFw SQogICAgIGNvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlN0b3JhZ2VBcmVhTWFwOjpEaWRDbGVh cigpLCBzdG9yYWdlTWFwSUQpOwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpzZXRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnlJbnRlcm5hbChjb25zdCBTdHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9y eSkKLXsKLSAgICBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeSA9IGxvY2FsU3RvcmFnZURpcmVjdG9y eTsKLX0KLQogdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3Bh Y2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIENvcmVJUEM6OkNvbm5lY3Rp b24qIGFsbG93ZWRDb25uZWN0aW9uLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCiB7CiAgICAgQVNT RVJUKCFtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5jb250YWlucyhzdG9yYWdlTmFtZXNwYWNl SUQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFu YWdlci5oCmluZGV4IDhiYWU1N2E2MzM3OTZjNDgxMGFiMjZlMzYwYjVjYTFiOTczYzJjMDIuLmU2 OTBlZDEzZGZmZjU0MTA3ZDQyMWI2NTE4OTg3N2RjYTdiMTVhNWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaApAQCAtNzAsOCArNzAs NiBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlSXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiwg dWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25z dCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogICAgIHZvaWQgY2xlYXIo Q29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291 cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogCi0gICAgdm9pZCBz ZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnlJbnRlcm5hbChjb25zdCBTdHJpbmcmKTsKLQogICAgIHZv aWQgY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdl TmFtZXNwYWNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb24qIGFsbG93ZWRDb25uZWN0aW9uLCB1bnNp Z25lZCBxdW90YUluQnl0ZXMpOwogICAgIHZvaWQgZGVzdHJveVNlc3Npb25TdG9yYWdlTmFtZXNw YWNlSW50ZXJuYWwodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKTsKICAgICB2b2lkIHNldEFs bG93ZWRTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUNvbm5lY3Rpb25JbnRlcm5hbCh1aW50NjRfdCBz dG9yYWdlTmFtZXNwYWNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb24qIGFsbG93ZWRDb25uZWN0aW9u KTsKQEAgLTg3LDggKzg1LDYgQEAgcHJpdmF0ZToKIAogICAgIFJlZlB0cjxXb3JrUXVldWU+IG1f cXVldWU7CiAKLSAgICBTdHJpbmcgbV9sb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7Ci0KICAgICBSZWZQ dHI8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyPiBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlcjsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8TG9jYWxTdG9yYWdlTmFtZXNwYWNl PiA+IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlczsKIAo=