139503 2014-12-10 12:48:50 -0800 Begin fixing transient local storage handling 2014-12-10 12:59:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1054278 0 andersca 2014-12-10 12:48:50 -0800 Begin fixing transient local storage handling 1054280 1 243058 andersca 2014-12-10 12:52:50 -0800 Created attachment 243058 Patch 1054283 2 andersca 2014-12-10 12:59:33 -0800 Committed r177090: <http://trac.webkit.org/changeset/177090> 243058 2014-12-10 12:52:50 -0800 2014-12-10 12:57:53 -0800 Patch bug-139503-20141210125331.patch text/plain 13279 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGQ1MDg5MGEwY2ZmYTAw MzIwZGY2ZWEzNDUyYmIxYjFlZDU5MzNlZS4uMDI1M2ZlMTdiZTE2ZmYzNGQwNzViNGYzMWI4NWFh OWUxN2I3ZWMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDE0LTEyLTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gZml4aW5n IHRyYW5zaWVudCBsb2NhbCBzdG9yYWdlIGhhbmRsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1MDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVRyYW5zaWVu dExvY2FsU3RvcmFnZU1hcCk6CisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaDoKKyAgICAgICAgQWRkIGVtcHR5IHN0dWIgaW1wbGVtZW50YXRpb24gb2YgY3JlYXRl VHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZU1hbmFnZXIubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBDcmVhdGVUcmFuc2llbnRM b2NhbFN0b3JhZ2VNYXAgbWVzc2FnZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlQXJlYU1hcC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpTdG9y YWdlQXJlYU1hcCk6CisgICAgICAgIElmIHdlIGhhdmUgYSBsb2NhbCBzdG9yYWdlIG5hbWVzcGFj ZSB3aXRoIGEgbm9uLW51bGwgdG9wLWxldmVsIG9yaWdpbiwgY3JlYXRlIGEgCisgICAgICAgIHRy YW5zaWVudCBsb2NhbCBzdG9yYWdlIG1hcC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VOYW1l c3BhY2VJbXBsOjpjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICBQYXNzIGEg bnVsbCB0b3AtbGV2ZWwgb3JpZ2luIHRvIHRoZSBTdG9yYWdlTmFtZXNwYWNlSW1wbCBjb25zdHJ1 Y3Rvci4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlVHJh bnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAgQ3JlYXRlIGEgbmV3IFN0b3Jh Z2VOYW1lc3BhY2VJbXBsLCBwYXNzaW5nIHRoZSB0b3AtbGV2ZWwgb3JpZ2luIHRvIHRoZSBjb25z dHJ1Y3Rvci4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRl U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICBQYXNzIGEgbnVsbCB0b3AtbGV2ZWwg b3JpZ2luIHRvIHRoZSBTdG9yYWdlTmFtZXNwYWNlSW1wbCBjb25zdHJ1Y3Rvci4KKworICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6U3RvcmFnZU5hbWVzcGFjZUltcGwpOgor ICAgICAgICBBZGQgYSB0b3AtbGV2ZWwgb3JpZ2luIHBhcmFtZXRlci4KKworICAgICAgICAqIFdl YlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5oOgorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6dG9wTGV2ZWxPcmlnaW4pOgorICAgICAgICBBZGQgdG9w LWxldmVsIG9yaWdpbiBtZW1iZXIgYW5kIGdldHRlci4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv U3RvcmFnZS9XZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFn ZU5hbWVzcGFjZSk6CisgICAgICAgIENhbGwgU3RvcmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVRy YW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS4KKworMjAxNC0xMi0xMCAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEltcGxlbWVudCBXZWJTdG9yYWdl TmFtZXNwYWNlUHJvdmlkZXI6OmNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDk4CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRl eCBlMzc3NzEyOTk0ODI2MDE0OGJmNjkwZDg3MTA1MGM5Yzk4M2Q2OWMxLi5jMmZiM2Q4MmFjNDZj ZjBhM2I5OWMxMTRiMjg1N2EyYTc3ZjdhMzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC00OTQsNiArNDk0LDExIEBA IHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUxvY2FsU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90CiAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHN0 b3JhZ2VBcmVhLnJlbGVhc2UoKTsKIH0KIAordm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlVHJh bnNpZW50TG9jYWxTdG9yYWdlTWFwKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0 X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YSYgdG9wTGV2ZWxPcmlnaW5EYXRhLCBjb25zdCBTZWN1cml0eU9yaWdpbkRh dGEmIHNlY3VyaXR5T3JpZ2luRGF0YSkKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMu Cit9CisKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTWFwKElQQzo6 Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBz dG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmln aW5EYXRhKQogewogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2su CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFu YWdlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu aAppbmRleCA5OTNlNjRlZTAwOGU0ZTMzNTE0ZTg1Mzg3ZjVhZmU5YWIxNzc4ZWNkLi5mZjMyMDM0 NTJkNTY3M2UyMGUwOGFmOTlmZjk0NGViMGFiNjMzM2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTc2LDYgKzc2LDcgQEAg cHJpdmF0ZToKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCiAgICAgdm9pZCBjcmVhdGVMb2Nh bFN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50 NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYpOworICAg IHZvaWQgY3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwKElQQzo6Q29ubmVjdGlvbiosIHVp bnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCBjb25zdCBT ZWN1cml0eU9yaWdpbkRhdGEmIHRvcExldmVsT3JpZ2luRGF0YSwgY29uc3QgU2VjdXJpdHlPcmln aW5EYXRhJik7CiAgICAgdm9pZCBjcmVhdGVTZXNzaW9uU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rp b24qLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwg Y29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJik7CiAgICAgdm9pZCBkZXN0cm95U3RvcmFnZU1hcChJ UEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5p biBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLm1lc3Nh Z2VzLmluCmluZGV4IDU5YjhmMzYzOTExZDljODY4ZTc2MjNmNDQwNjRjMGY1MTNkNTViYmQuLjNh MGVmNDNlY2Q5OTk0M2YxZTdiNTQwNDJjMmZmMTVmNTYzZDdmYzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLm1lc3NhZ2VzLmluCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLm1lc3Nh Z2VzLmluCkBAIC0yMiw2ICsyMiw3IEBACiAKIG1lc3NhZ2VzIC0+IFN0b3JhZ2VNYW5hZ2VyIHsK ICAgICBDcmVhdGVMb2NhbFN0b3JhZ2VNYXAodWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRf dCBzdG9yYWdlTmFtZXNwYWNlSUQsIFdlYktpdDo6U2VjdXJpdHlPcmlnaW5EYXRhIHNlY3VyaXR5 T3JpZ2luRGF0YSkgV2FudHNDb25uZWN0aW9uCisgICAgQ3JlYXRlVHJhbnNpZW50TG9jYWxTdG9y YWdlTWFwKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlE LCBXZWJLaXQ6OlNlY3VyaXR5T3JpZ2luRGF0YSB0b3BMZXZlbFNlY3VyaXR5T3JpZ2luRGF0YSwg V2ViS2l0OjpTZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJpdHlPcmlnaW5EYXRhKSBXYW50c0Nvbm5l Y3Rpb24KICAgICBDcmVhdGVTZXNzaW9uU3RvcmFnZU1hcCh1aW50NjRfdCBzdG9yYWdlTWFwSUQs IHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgV2ViS2l0OjpTZWN1cml0eU9yaWdpbkRhdGEg c2VjdXJpdHlPcmlnaW5EYXRhKSBXYW50c0Nvbm5lY3Rpb24KICAgICBEZXN0cm95U3RvcmFnZU1h cCh1aW50NjRfdCBzdG9yYWdlTWFwSUQpIFdhbnRzQ29ubmVjdGlvbgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcAppbmRleCBh ZTRjZTZlMjAwNGI4MzcwNDJmOWMxZmY4NWNhNmEwODQ2OWVmZGNlLi43NmIwOWFlZDFiODRhOWZm M2UyMDZjMzIwNjFhNGVmN2VkY2RiMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKQEAgLTY4LDEwICs2OCwyMCBAQCBT dG9yYWdlQXJlYU1hcDo6U3RvcmFnZUFyZWFNYXAoU3RvcmFnZU5hbWVzcGFjZUltcGwqIHN0b3Jh Z2VOYW1lc3BhY2UsIFBhc3NSZWZQdAogICAgICwgbV9oYXNQZW5kaW5nQ2xlYXIoZmFsc2UpCiAg ICAgLCBtX2hhc1BlbmRpbmdHZXRWYWx1ZXMoZmFsc2UpCiB7Ci0gICAgaWYgKG1fc3RvcmFnZVR5 cGUgPT0gTG9jYWxTdG9yYWdlKQotICAgICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQ cm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6Q3JlYXRl TG9jYWxTdG9yYWdlTWFwKG1fc3RvcmFnZU1hcElELCBzdG9yYWdlTmFtZXNwYWNlLT5zdG9yYWdl TmFtZXNwYWNlSUQoKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4obV9z ZWN1cml0eU9yaWdpbi5nZXQoKSkpLCAwKTsKLSAgICBlbHNlCisgICAgc3dpdGNoIChtX3N0b3Jh Z2VUeXBlKSB7CisgICAgY2FzZSBXZWJDb3JlOjpMb2NhbFN0b3JhZ2U6CisgICAgICAgIGlmIChT ZWN1cml0eU9yaWdpbiogdG9wTGV2ZWxPcmlnaW4gPSBzdG9yYWdlTmFtZXNwYWNlLT50b3BMZXZl bE9yaWdpbigpKQorICAgICAgICAgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vz c0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6U3RvcmFnZU1hbmFnZXI6OkNyZWF0ZVRyYW5z aWVudExvY2FsU3RvcmFnZU1hcChtX3N0b3JhZ2VNYXBJRCwgc3RvcmFnZU5hbWVzcGFjZS0+c3Rv cmFnZU5hbWVzcGFjZUlEKCksIFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2lu KHRvcExldmVsT3JpZ2luKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4o bV9zZWN1cml0eU9yaWdpbi5nZXQoKSkpLCAwKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg V2ViUHJvY2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNz YWdlczo6U3RvcmFnZU1hbmFnZXI6OkNyZWF0ZUxvY2FsU3RvcmFnZU1hcChtX3N0b3JhZ2VNYXBJ RCwgc3RvcmFnZU5hbWVzcGFjZS0+c3RvcmFnZU5hbWVzcGFjZUlEKCksIFNlY3VyaXR5T3JpZ2lu RGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKSwgMCk7CisK KyAgICAgICAgYnJlYWs7CisKKyAgICBjYXNlIFdlYkNvcmU6OlNlc3Npb25TdG9yYWdlOgogICAg ICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5k KE1lc3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6Q3JlYXRlU2Vzc2lvblN0b3JhZ2VNYXAobV9zdG9y YWdlTWFwSUQsIHN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VOYW1lc3BhY2VJRCgpLCBTZWN1cml0 eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbihtX3NlY3VyaXR5T3JpZ2luLmdldCgpKSks IDApOworICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5h ZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlN0b3JhZ2VBcmVhTWFwOjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fc3RvcmFnZU1hcElELCAqdGhpcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3Bw CmluZGV4IGNkN2M0NmMzZDYzNTgxOTJlYjQ5NmZiNjUxY2EwYzM0NjYwNThhMGEuLjg3YTBlODVj NmNiYWZjZmEwYzBlNWZhYzBlMDI5NGQzM2U0N2E3NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcApA QCAtNDksMjEgKzQ5LDI2IEBAIHN0YXRpYyBMb2NhbFN0b3JhZ2VOYW1lc3BhY2VNYXAmIGxvY2Fs U3RvcmFnZU5hbWVzcGFjZU1hcCgpCiAgICAgcmV0dXJuIGxvY2FsU3RvcmFnZU5hbWVzcGFjZU1h cDsKIH0KIAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gU3RvcmFnZU5hbWVzcGFj ZUltcGw6OmNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBpZGVudGlmaWVyLCB1 bnNpZ25lZCBxdW90YUluQnl0ZXMpCitSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+IFN0b3Jh Z2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3QgaWRl bnRpZmllciwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKQogewogICAgIExvY2FsU3RvcmFnZU5hbWVz cGFjZU1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9IGxvY2FsU3RvcmFnZU5hbWVzcGFjZU1hcCgpLmFk ZChpZGVudGlmaWVyLCBudWxscHRyKTsKICAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KQogICAg ICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsKIAotICAgIFJlZlB0cjxTdG9yYWdl TmFtZXNwYWNlSW1wbD4gbG9jYWxTdG9yYWdlTmFtZXNwYWNlID0gYWRvcHRSZWYobmV3IFN0b3Jh Z2VOYW1lc3BhY2VJbXBsKExvY2FsU3RvcmFnZSwgaWRlbnRpZmllciwgcXVvdGFJbkJ5dGVzKSk7 CisgICAgUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2Ug PSBhZG9wdFJlZihuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwoTG9jYWxTdG9yYWdlLCBpZGVudGlm aWVyLCBudWxscHRyLCBxdW90YUluQnl0ZXMpKTsKIAogICAgIHJlc3VsdC5pdGVyYXRvci0+dmFs dWUgPSBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UuZ2V0KCk7CiAgICAgcmV0dXJuIGxvY2FsU3RvcmFn ZU5hbWVzcGFjZS5yZWxlYXNlKCk7CiB9CiAKK1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4g U3RvcmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFj ZSh1aW50NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYgdG9wTGV2ZWxP cmlnaW4sIHVpbnQ2NF90IHF1b3RhSW5CeXRlcykKK3sKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3 IFN0b3JhZ2VOYW1lc3BhY2VJbXBsKExvY2FsU3RvcmFnZSwgaWRlbnRpZmllciwgJnRvcExldmVs T3JpZ2luLCBxdW90YUluQnl0ZXMpKTsKK30KKwogUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNl SW1wbD4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNl KFdlYlBhZ2UqIHdlYlBhZ2UpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFt ZXNwYWNlSW1wbChTZXNzaW9uU3RvcmFnZSwgd2ViUGFnZS0+cGFnZUlEKCksIHdlYlBhZ2UtPmNv cmVQYWdlKCktPnNldHRpbmdzKCkuc2Vzc2lvblN0b3JhZ2VRdW90YSgpKSk7CisgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChTZXNzaW9uU3RvcmFnZSwgd2ViUGFn ZS0+cGFnZUlEKCksIG51bGxwdHIsIHdlYlBhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkuc2Vz c2lvblN0b3JhZ2VRdW90YSgpKSk7CiB9CiAKIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUlt cGw+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UoUGFn ZUdyb3VwKiBwYWdlR3JvdXApCkBAIC03NCw5ICs3OSwxMCBAQCBQYXNzUmVmUHRyPFN0b3JhZ2VO YW1lc3BhY2VJbXBsPiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlTG9jYWxTdG9yYWdlTmFt ZXNwYQogICAgIHJldHVybiBjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UocGFnZUdyb3VwSUQs IHF1b3RhKTsKIH0KIAotU3RvcmFnZU5hbWVzcGFjZUltcGw6OlN0b3JhZ2VOYW1lc3BhY2VJbXBs KFdlYkNvcmU6OlN0b3JhZ2VUeXBlIHN0b3JhZ2VUeXBlLCB1aW50NjRfdCBzdG9yYWdlTmFtZXNw YWNlSUQsIHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKK1N0b3JhZ2VOYW1lc3BhY2VJbXBsOjpTdG9y YWdlTmFtZXNwYWNlSW1wbChXZWJDb3JlOjpTdG9yYWdlVHlwZSBzdG9yYWdlVHlwZSwgdWludDY0 X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogdG9wTGV2ZWxP cmlnaW4sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKICAgICA6IG1fc3RvcmFnZVR5cGUoc3RvcmFn ZVR5cGUpCiAgICAgLCBtX3N0b3JhZ2VOYW1lc3BhY2VJRChzdG9yYWdlTmFtZXNwYWNlSUQpCisg ICAgLCBtX3RvcExldmVsT3JpZ2luKHRvcExldmVsT3JpZ2luKQogICAgICwgbV9xdW90YUluQnl0 ZXMocXVvdGFJbkJ5dGVzKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaAppbmRleCBjYzRjNjI4YjFhYWUy NTQxY2NmNzM4YWVjMDFiZjliMTQxYWI0NmQxLi44NTMyZGU5MTg4ZGIwYTYwODMwYWFjYzZlYTQx ZTIzMDQ0YTNjYmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaApAQCAtMzgsMTkgKzM4LDIyIEBAIGNsYXNz IFdlYlBhZ2U7CiAKIGNsYXNzIFN0b3JhZ2VOYW1lc3BhY2VJbXBsIDogcHVibGljIFdlYkNvcmU6 OlN0b3JhZ2VOYW1lc3BhY2UgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3Jh Z2VOYW1lc3BhY2VJbXBsPiBjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3QgaWRl bnRpZmllciwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsKKyAgICBzdGF0aWMgUmVmUHRyPFN0b3Jh Z2VOYW1lc3BhY2VJbXBsPiBjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3QgaWRl bnRpZmllciwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsKKyAgICBzdGF0aWMgUmVmUHRyPFN0b3Jh Z2VOYW1lc3BhY2VJbXBsPiBjcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWlu dDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mIHRvcExldmVsT3JpZ2lu LCB1aW50NjRfdCBxdW90YUluQnl0ZXMpOworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U3RvcmFn ZU5hbWVzcGFjZUltcGw+IGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFdlYlBhZ2UqKTsK ICAgICB2aXJ0dWFsIH5TdG9yYWdlTmFtZXNwYWNlSW1wbCgpOwogCiAgICAgV2ViQ29yZTo6U3Rv cmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX3N0b3JhZ2VUeXBlOyB9CiAg ICAgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKCkgY29uc3QgeyByZXR1cm4gbV9zdG9yYWdl TmFtZXNwYWNlSUQ7IH0KKyAgICBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogdG9wTGV2ZWxPcmln aW4oKSBjb25zdCB7IHJldHVybiBtX3RvcExldmVsT3JpZ2luLmdldCgpOyB9CiAgICAgdW5zaWdu ZWQgcXVvdGFJbkJ5dGVzKCkgY29uc3QgeyByZXR1cm4gbV9xdW90YUluQnl0ZXM7IH0KIAogICAg IC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBkZXByZWNhdGVkIG92ZXJsb2FkLgogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UoV2ViQ29yZTo6UGFnZUdyb3VwKik7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgU3RvcmFn ZU5hbWVzcGFjZUltcGwoV2ViQ29yZTo6U3RvcmFnZVR5cGUsIHVpbnQ2NF90IHN0b3JhZ2VOYW1l c3BhY2VJRCwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsKKyAgICBleHBsaWNpdCBTdG9yYWdlTmFt ZXNwYWNlSW1wbChXZWJDb3JlOjpTdG9yYWdlVHlwZSwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFj ZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogdG9wTGV2ZWxPcmlnaW4sIHVuc2lnbmVkIHF1 b3RhSW5CeXRlcyk7CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U3RvcmFnZUFy ZWE+IHN0b3JhZ2VBcmVhKFBhc3NSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+KSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U3RvcmFnZU5hbWVzcGFjZT4g Y29weShXZWJDb3JlOjpQYWdlKikgb3ZlcnJpZGU7CkBAIC02MCw5ICs2MywxMyBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBzeW5jKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGNs b3NlSWRsZUxvY2FsU3RvcmFnZURhdGFiYXNlcygpIG92ZXJyaWRlOwogCi0gICAgV2ViQ29yZTo6 U3RvcmFnZVR5cGUgbV9zdG9yYWdlVHlwZTsKLSAgICB1aW50NjRfdCBtX3N0b3JhZ2VOYW1lc3Bh Y2VJRDsKLSAgICB1bnNpZ25lZCBtX3F1b3RhSW5CeXRlczsKKyAgICBjb25zdCBXZWJDb3JlOjpT dG9yYWdlVHlwZSBtX3N0b3JhZ2VUeXBlOworICAgIGNvbnN0IHVpbnQ2NF90IG1fc3RvcmFnZU5h bWVzcGFjZUlEOworCisgICAgLy8gT25seSB1c2VkIGZvciB0cmFuc2llbnQgbG9jYWwgc3RvcmFn ZSBuYW1lc3BhY2VzLgorICAgIGNvbnN0IFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4g bV90b3BMZXZlbE9yaWdpbjsKKworICAgIGNvbnN0IHVuc2lnbmVkIG1fcXVvdGFJbkJ5dGVzOwog CiAgICAgSGFzaE1hcDxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+LCBSZWZQdHI8U3Rv cmFnZUFyZWFNYXA+PiBtX3N0b3JhZ2VBcmVhTWFwczsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTdG9yYWdlTmFtZXNwYWNl UHJvdmlkZXIuY3BwCmluZGV4IGJlZmFlYTMyMDYwNDY5YWUzZGI5ZDE4YzdmODQ2MDg1N2M5YTM5 NTUuLmRiNjczMWEwZWUxMmUzNGU5NDMyNTQwODg3NzA4N2EzOGU4YzBhM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTdG9yYWdlTmFtZXNwYWNlUHJv dmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTdG9y YWdlTmFtZXNwYWNlUHJvdmlkZXIuY3BwCkBAIC03MCwxMCArNzAsOSBAQCBSZWZQdHI8V2ViQ29y ZTo6U3RvcmFnZU5hbWVzcGFjZT4gV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjcmVhdGVM b2NhbFN0b3JhZwogICAgIHJldHVybiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlTG9jYWxT dG9yYWdlTmFtZXNwYWNlKG1faWRlbnRpZmllciwgcXVvdGEpOwogfQogCi1SZWZQdHI8V2ViQ29y ZTo6U3RvcmFnZU5hbWVzcGFjZT4gV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjcmVhdGVU cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mLCB1 bnNpZ25lZCBxdW90YSkKK1JlZlB0cjxXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlPiBXZWJTdG9y YWdlTmFtZXNwYWNlUHJvdmlkZXI6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFj ZShXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYgdG9wTGV2ZWxPcmlnaW4sIHVuc2lnbmVkIHF1b3Rh KQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCi0gICAgcmV0dXJuIG51bGxwdHI7CisgICAg cmV0dXJuIFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VO YW1lc3BhY2UobV9pZGVudGlmaWVyLCB0b3BMZXZlbE9yaWdpbiwgcXVvdGEpOwogfQogCiB9Cg==