54332 2011-02-11 19:01:13 -0800 Can’t open local files on reload or navigation from the back/forward cache 2011-02-11 19:16:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 350212 0 andersca 2011-02-11 19:01:13 -0800 Can’t open local files on reload or navigation from the back/forward cache 350213 1 82225 andersca 2011-02-11 19:13:38 -0800 Created attachment 82225 Patch 350214 2 82225 mjs 2011-02-11 19:16:00 -0800 Comment on attachment 82225 Patch r=me 350215 3 andersca 2011-02-11 19:16:51 -0800 Committed r78405: <http://trac.webkit.org/changeset/78405> 82225 2011-02-11 19:13:38 -0800 2011-02-11 19:16:00 -0800 Patch bug-54332-20110211191337.patch text/plain 15163 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4NDAzKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTMgQEAKKzIwMTEtMDItMTEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDYW7igJl0IG9wZW4gbG9jYWwgZmlsZXMgb24gcmVsb2Fk IG9yIG5hdmlnYXRpb24gZnJvbSB0aGUgYmFjay9mb3J3YXJkIGNhY2hlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDMzMgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODkwMzA3Nj4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5Ojppc0luc3BlY3RvclBh Z2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oOgorICAgICAgICBD aGVjayB3aGV0aGVyIHRoZSBnaXZlbiBwYWdlIGlzIGEgd2ViIGluc3BlY3RvciBwYWdlLgorCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOgorICAgICAgICBJ ZiB0aGlzIGlzIGEgd2ViIGluc3BlY3RvciBwYWdlLCB3ZSBkb24ndCB3YW50IHRvIG1ha2UgYSBz YW5kYm94IGV4dGVuc2lvbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0 YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmdvRm9yd2FyZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29CYWNrKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAg ICAgUGFzcyBhIHNhbmRib3ggZXh0ZW5zaW9uIGFsb25nIHdoZW4gc2VuZGluZyB0aGUgbWVzc2Fn ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgTWFrZSBp bml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZSBhIG1lbWJlciBmdW5jdGlvbi4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6cmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRhKToKKyAgICAgICAgUGFz cyBhIHNhbmRib3ggZXh0ZW5zaW9uIGFsb25nLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb0ZvcndhcmQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb0JhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAgICAgSGFuZCB0aGUgc2FuZGJveCBleHRl bnNpb24gdG8gdGhlIHNhbmRib3ggZXh0ZW5zaW9uIHRyYWNrZXIuCisKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6cmVzdG9yZVNlc3Npb25BbmROYXZpZ2F0ZVRvQ3VycmVudEl0ZW0pOgorICAg ICAgICBQYXNzIHRoZSBzYW5kYm94IGV4dGVuc2lvbiB0byBnb1RvQmFja0ZvcndhcmRJdGVtLgor CisgICAgICAgIChXZWJLaXQ6OnNob3VsZFJldXNlQ29tbWl0dGVkU2FuZGJveEV4dGVuc2lvbik6 CisgICAgICAgIE5ldyBmdW5jdGlvbiB0aGF0IGNoZWNrcyB3aGV0aGVyIGEgY29tbWl0dGVkIHNh bmRib3ggZXh0ZW5zaW9uIHNob3VsZCBiZSByZS11c2VkLiBXZQorICAgICAgICBkbyB0aGlzIGZv ciBwYWdlIHJlbG9hZHMsIGFzIHdlbGwgYXMgcmVndWxhciBwYWdlIG5hdmlnYXRpb25zIHdoZW4g Ym90aCB0aGUgY29tbWl0dGVkCisgICAgICAgIGFuZCBwcm92aXNpb25hbCBkb2N1bWVudHMgaGF2 ZSBmaWxlIFVSTHMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6U2FuZGJveEV4dGVuc2lv blRyYWNrZXI6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgUmV1c2UgdGhlIGNv bW1pdHRlZCBzYW5kYm94IGV4dGVuc2lvbiBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDExLTAyLTExICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhh cm9uQG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIFF0IHdlYmtpdDIgYnVpbGQgZml4 IGFmdGVyIHI3ODM5Mi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0 b3JQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYklu c3BlY3RvclByb3h5LmNwcAkocmV2aXNpb24gNzgzOTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNiArMTU4 LDExIEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnRvZ2dsZVBhZ2VQcm9maWwKICAgICBtX2lz UHJvZmlsaW5nUGFnZSA9ICFtX2lzUHJvZmlsaW5nUGFnZTsKIH0KIAorYm9vbCBXZWJJbnNwZWN0 b3JQcm94eTo6aXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSkKK3sKKyAgICByZXR1 cm4gcGFnZS0+cGFnZUdyb3VwKCkgPT0gaW5zcGVjdG9yUGFnZUdyb3VwKCk7Cit9CisKIC8vIENh bGxlZCBieSBXZWJJbnNwZWN0b3JQcm94eSBtZXNzYWdlcwogdm9pZCBXZWJJbnNwZWN0b3JQcm94 eTo6Y3JlYXRlSW5zcGVjdG9yUGFnZSh1aW50NjRfdCYgaW5zcGVjdG9yUGFnZUlELCBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzJiBpbnNwZWN0b3JQYWdlUGFyYW1ldGVycykKIHsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCShyZXZpc2lvbiA3 ODM5OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCSh3 b3JraW5nIGNvcHkpCkBAIC05Myw2ICs5Myw4IEBAIHB1YmxpYzoKICAgICBDb3JlSVBDOjpTeW5j UmVwbHlNb2RlIGRpZFJlY2VpdmVTeW5jV2ViSW5zcGVjdG9yUHJveHlNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rl ciosIENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciopOwogI2VuZGlmCiAKKyAgICBzdGF0aWMgYm9v bCBpc0luc3BlY3RvclBhZ2UoV2ViUGFnZVByb3h5Kik7CisKIHByaXZhdGU6CiAgICAgV2ViSW5z cGVjdG9yUHJveHkoV2ViUGFnZVByb3h5KiBwYWdlKTsKIApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc4Mzk4KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MCw5 ICsyNDAsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzVwogICAg ICAgICBtX2JhY2tGb3J3YXJkTGlzdC0+Z29Ub0l0ZW0oaXRlbSk7CiAgICAgCiAgICAgcmVhdHRh Y2hUb1dlYlByb2Nlc3MoKTsKLSAgICAKLSAgICBpZiAoaXRlbSkKLSAgICAgICAgcHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKGl0ZW0tPml0ZW1J RCgpKSwgbV9wYWdlSUQpOworCisgICAgaWYgKCFpdGVtKQorICAgICAgICByZXR1cm47CisKKyAg ICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZTsKKyAgICBp bml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShLVVJMKEtVUkwoKSwgaXRlbS0+dXJsKCkp LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0oaXRlbS0+aXRlbUlEKCksIHNhbmRib3hFeHRl bnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFs aXplV2ViUGFnZSgpCkBAIC0zMjUsMTEgKzMyOSwxNSBAQCBib29sIFdlYlBhZ2VQcm94eTo6dHJ5 Q2xvc2UoKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNh bmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgS1VSTCYgdXJsLCBTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpCit2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlh bGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgS1VSTCYgdXJsLCBTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpCiB7CiAgICAgaWYgKCF1cmwuaXNM b2NhbEZpbGUoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gRG9uJ3QgZ2l2ZSB0aGUgaW5z cGVjdG9yIGZ1bGwgYWNjZXNzIHRvIHRoZSBmaWxlIHN5c3RlbS4KKyAgICBpZiAoV2ViSW5zcGVj dG9yUHJveHk6OmlzSW5zcGVjdG9yUGFnZSh0aGlzKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKCIvIiwgU2FuZGJveEV4dGVuc2lvbjo6UmVh ZE9ubHksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogfQogCkBAIC00MTcsNyArNDI1LDkgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmdvRm9yd2FyZCgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvRm9yd2FyZChmb3J3YXJk SXRlbS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl IHNhbmRib3hFeHRlbnNpb25IYW5kbGU7CisgICAgaW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25I YW5kbGUoS1VSTChLVVJMKCksIGZvcndhcmRJdGVtLT51cmwoKSksIHNhbmRib3hFeHRlbnNpb25I YW5kbGUpOworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Gb3J3YXJk KGZvcndhcmRJdGVtLT5pdGVtSUQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSksIG1fcGFnZUlE KTsKIH0KIAogYm9vbCBXZWJQYWdlUHJveHk6OmNhbkdvRm9yd2FyZCgpIGNvbnN0CkBAIC00Mzks NyArNDQ5LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmdvQmFjaygpCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvQmFjayhi YWNrSXRlbS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGU7CisgICAgaW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNp b25IYW5kbGUoS1VSTChLVVJMKCksIGJhY2tJdGVtLT51cmwoKSksIHNhbmRib3hFeHRlbnNpb25I YW5kbGUpOworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29CYWNrKGJh Y2tJdGVtLT5pdGVtSUQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSksIG1fcGFnZUlEKTsKIH0K IAogYm9vbCBXZWJQYWdlUHJveHk6OmNhbkdvQmFjaygpIGNvbnN0CkBAIC00NTQsNyArNDY2LDkg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oVwogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1Rv QmFja0ZvcndhcmRJdGVtKGl0ZW0tPml0ZW1JRCgpKSwgbV9wYWdlSUQpOworICAgIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOworICAgIGluaXRpYWxpemVT YW5kYm94RXh0ZW5zaW9uSGFuZGxlKEtVUkwoS1VSTCgpLCBpdGVtLT51cmwoKSksIHNhbmRib3hF eHRlbnNpb25IYW5kbGUpOworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 R29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtLT5pdGVtSUQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSksIG1fcGFnZUlEKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENoYW5nZUJhY2tGb3J3 YXJkTGlzdChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBhZGRlZCwgVmVjdG9yPFJlZlB0cjxBUElP YmplY3Q+ID4qIHJlbW92ZWQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCShyZXZpc2lvbiA3ODM5OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkRy YWdDb250cm9sbGVyQWN0aW9uLmgiCiAjaW5jbHVkZSAiRHJhd2luZ0FyZWFQcm94eS5oIgogI2lu Y2x1ZGUgIkdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuaCIKKyNpbmNs dWRlICJTYW5kYm94RXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiU2VsZWN0aW9uU3RhdGUuaCIKICNp bmNsdWRlICJTaGFyZWRNZW1vcnkuaCIKICNpbmNsdWRlICJXS0Jhc2UuaCIKQEAgLTU2OSw2ICs1 NzAsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIHsg bV9wZW5kaW5nQVBJUmVxdWVzdFVSTCA9IFN0cmluZygpOyB9CiAgICAgdm9pZCBzZXRQZW5kaW5n QVBJUmVxdWVzdFVSTChjb25zdCBTdHJpbmcmIHBlbmRpbmdBUElSZXF1ZXN0VVJMKSB7IG1fcGVu ZGluZ0FQSVJlcXVlc3RVUkwgPSBwZW5kaW5nQVBJUmVxdWVzdFVSTDsgfQogCisgICAgdm9pZCBp bml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShjb25zdCBXZWJDb3JlOjpLVVJMJiwgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CisKICAgICBQYWdlQ2xpZW50KiBtX3BhZ2VDbGllbnQ7 CiAgICAgV2ViTG9hZGVyQ2xpZW50IG1fbG9hZGVyQ2xpZW50OwogICAgIFdlYlBvbGljeUNsaWVu dCBtX3BvbGljeUNsaWVudDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQ YWdlUHJveHlDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Nm L1dlYlBhZ2VQcm94eUNGLmNwcAkocmV2aXNpb24gNzgzOTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5Q0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyAr MTMzLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXN0b3JlRnJvbVNlc3Npb25TdGEKICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkKICAgICAgICAgcHJvY2VzcygpLT5yZWdp c3Rlck5ld1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oZW50cmllc1tpXS5nZXQoKSk7CiAKLSAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlJlc3RvcmVTZXNzaW9uQW5kTmF2aWdh dGVUb0N1cnJlbnRJdGVtKFNlc3Npb25TdGF0ZShtX2JhY2tGb3J3YXJkTGlzdC0+ZW50cmllcygp LCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEluZGV4KCkpKSwgbV9wYWdlSUQpOworICAgIFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOworICAgIGlmIChX ZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJ dGVtKCkpCisgICAgICAgIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKEtVUkwoS1VS TCgpLCBpdGVtLT51cmwoKSksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOworCisgICAgcHJvY2Vz cygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpSZXN0b3JlU2Vzc2lvbkFuZE5hdmlnYXRlVG9D dXJyZW50SXRlbShTZXNzaW9uU3RhdGUobV9iYWNrRm9yd2FyZExpc3QtPmVudHJpZXMoKSwgbV9i YWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJbmRleCgpKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSks IG1fcGFnZUlEKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA3ODM5OCkK KysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDgwLDIwICs0ODAsMjYgQEAgdm9pZCBXZWJQYWdlOjpyZWxvYWQoYm9vbCBy ZWxvYWRGcm9tT3JpZwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnJl bG9hZChyZWxvYWRGcm9tT3JpZ2luKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpnb0ZvcndhcmQodWlu dDY0X3QgYmFja0ZvcndhcmRJdGVtSUQpCit2b2lkIFdlYlBhZ2U6OmdvRm9yd2FyZCh1aW50NjRf dCBiYWNrRm9yd2FyZEl0ZW1JRCwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKQogeworICAgIG1fc2FuZGJveEV4dGVuc2lvblRyYWNrZXIuYmVn aW5Mb2FkKG1fbWFpbkZyYW1lLmdldCgpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKKwogICAg IEhpc3RvcnlJdGVtKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6Oml0ZW1Gb3JJRChi YWNrRm9yd2FyZEl0ZW1JRCk7CiAgICAgbV9wYWdlLT5nb1RvSXRlbShpdGVtLCBGcmFtZUxvYWRU eXBlRm9yd2FyZCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6Z29CYWNrKHVpbnQ2NF90IGJhY2tGb3J3 YXJkSXRlbUlEKQordm9pZCBXZWJQYWdlOjpnb0JhY2sodWludDY0X3QgYmFja0ZvcndhcmRJdGVt SUQsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSkKIHsKKyAgICBtX3NhbmRib3hFeHRlbnNpb25UcmFja2VyLmJlZ2luTG9hZChtX21haW5GcmFt ZS5nZXQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisKICAgICBIaXN0b3J5SXRlbSogaXRl bSA9IFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjppdGVtRm9ySUQoYmFja0ZvcndhcmRJdGVtSUQp OwogICAgIG1fcGFnZS0+Z29Ub0l0ZW0oaXRlbSwgRnJhbWVMb2FkVHlwZUJhY2spOwogfQogCi12 b2lkIFdlYlBhZ2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgYmFja0ZvcndhcmRJdGVt SUQpCit2b2lkIFdlYlBhZ2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgYmFja0Zvcndh cmRJdGVtSUQsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lv bkhhbmRsZSkKIHsKKyAgICBtX3NhbmRib3hFeHRlbnNpb25UcmFja2VyLmJlZ2luTG9hZChtX21h aW5GcmFtZS5nZXQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisKICAgICBIaXN0b3J5SXRl bSogaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjppdGVtRm9ySUQoYmFja0ZvcndhcmRJ dGVtSUQpOwogICAgIG1fcGFnZS0+Z29Ub0l0ZW0oaXRlbSwgRnJhbWVMb2FkVHlwZUluZGV4ZWRC YWNrRm9yd2FyZCk7CiB9CkBAIC0xMDIzLDEwICsxMDI5LDEwIEBAIHVpbnQ2NF90IFdlYlBhZ2U6 OnJlc3RvcmVTZXNzaW9uKGNvbnN0IFMKICAgICByZXR1cm4gY3VycmVudEl0ZW1JRDsKIH0KIAot dm9pZCBXZWJQYWdlOjpyZXN0b3JlU2Vzc2lvbkFuZE5hdmlnYXRlVG9DdXJyZW50SXRlbShjb25z dCBTZXNzaW9uU3RhdGUmIHNlc3Npb25TdGF0ZSkKK3ZvaWQgV2ViUGFnZTo6cmVzdG9yZVNlc3Np b25BbmROYXZpZ2F0ZVRvQ3VycmVudEl0ZW0oY29uc3QgU2Vzc2lvblN0YXRlJiBzZXNzaW9uU3Rh dGUsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSkKIHsKICAgICBpZiAodWludDY0X3QgY3VycmVudEl0ZW1JRCA9IHJlc3RvcmVTZXNzaW9uKHNl c3Npb25TdGF0ZSkpCi0gICAgICAgIGdvVG9CYWNrRm9yd2FyZEl0ZW0oY3VycmVudEl0ZW1JRCk7 CisgICAgICAgIGdvVG9CYWNrRm9yd2FyZEl0ZW0oY3VycmVudEl0ZW1JRCwgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSk7CiB9CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpAQCAtMTc5MiwxMSAr MTc5OCwzOSBAQCB2b2lkIFdlYlBhZ2U6OlNhbmRib3hFeHRlbnNpb25UcmFja2VyOjpiCiAgICAg bV9wZW5kaW5nUHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbjo6 Y3JlYXRlKGhhbmRsZSk7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZFJldXNlQ29tbWl0dGVkU2Fu ZGJveEV4dGVuc2lvbihXZWJGcmFtZSogZnJhbWUpCit7CisgICAgQVNTRVJUKGZyYW1lLT5pc01h aW5GcmFtZSgpKTsKKworICAgIEZyYW1lTG9hZGVyKiBmcmFtZUxvYWRlciA9IGZyYW1lLT5jb3Jl RnJhbWUoKS0+bG9hZGVyKCk7CisgICAgRnJhbWVMb2FkVHlwZSBmcmFtZUxvYWRUeXBlID0gZnJh bWVMb2FkZXItPmxvYWRUeXBlKCk7CisKKyAgICAvLyBJZiB0aGUgcGFnZSBpcyBiZWluZyByZWxv YWRlZCwgaXQgc2hvdWxkIHJldXNlIHdoYXRldmVyIGV4dGVuc2lvbiBpcyBjb21taXR0ZWQuCisg ICAgaWYgKGZyYW1lTG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVJlbG9hZCB8fCBmcmFtZUxvYWRU eXBlID09IEZyYW1lTG9hZFR5cGVSZWxvYWRGcm9tT3JpZ2luKQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZyYW1lTG9hZGVyLT5k b2N1bWVudExvYWRlcigpOworICAgIERvY3VtZW50TG9hZGVyKiBwcm92aXNpb25hbERvY3VtZW50 TG9hZGVyID0gZnJhbWVMb2FkZXItPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKTsKKyAgICBp ZiAoIWRvY3VtZW50TG9hZGVyIHx8ICFwcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoZG9jdW1lbnRMb2FkZXItPnVybCgpLmlzTG9jYWxG aWxlKCkgJiYgcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+dXJsKCkuaXNMb2NhbEZpbGUoKSAK KyAgICAgICAgJiYgcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+dHJpZ2dlcmluZ0FjdGlvbigp LnR5cGUoKSA9PSBOYXZpZ2F0aW9uVHlwZUxpbmtDbGlja2VkKQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQYWdlOjpTYW5kYm94RXh0ZW5z aW9uVHJhY2tlcjo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWQoV2ViRnJhbWUqIGZyYW1lKQogewog ICAgIGlmICghZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlm IChzaG91bGRSZXVzZUNvbW1pdHRlZFNhbmRib3hFeHRlbnNpb24oZnJhbWUpKSB7CisgICAgICAg IG1fcGVuZGluZ1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lvbiA9IG1fY29tbWl0dGVkU2FuZGJv eEV4dGVuc2lvbi5yZWxlYXNlKCk7CisgICAgICAgIEFTU0VSVCghbV9jb21taXR0ZWRTYW5kYm94 RXh0ZW5zaW9uKTsKKyAgICB9CisKICAgICBBU1NFUlQoIW1fcHJvdmlzaW9uYWxTYW5kYm94RXh0 ZW5zaW9uKTsKIAogICAgIG1fcHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uID0gbV9wZW5kaW5n UHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uLnJlbGVhc2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gNzgzOTgpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0zNTQsMTUgKzM1NCwxNSBAQCBwcml2YXRlOgogCiAgICAgLy8gQWN0aW9ucwogICAgIHZv aWQgdHJ5Q2xvc2UoKTsKLSAgICB2b2lkIGxvYWRVUkwoY29uc3QgU3RyaW5nJiwgY29uc3QgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICB2b2lk IGxvYWRVUkxSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgdm9p ZCBsb2FkVVJMKGNvbnN0IFN0cmluZyYsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYp OworICAgIHZvaWQgbG9hZFVSTFJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CiAgICAgdm9pZCBsb2FkSFRNTFN0 cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCk7CiAg ICAgdm9pZCBsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcs IGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCk7CiAg ICAgdm9pZCBsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgcmVs b2FkKGJvb2wgcmVsb2FkRnJvbU9yaWdpbik7Ci0gICAgdm9pZCBnb0ZvcndhcmQodWludDY0X3Qp OwotICAgIHZvaWQgZ29CYWNrKHVpbnQ2NF90KTsKLSAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0 ZW0odWludDY0X3QpOworICAgIHZvaWQgZ29Gb3J3YXJkKHVpbnQ2NF90LCBjb25zdCBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUmKTsKKyAgICB2b2lkIGdvQmFjayh1aW50NjRfdCwgY29uc3QgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CisgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKHVp bnQ2NF90LCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKICAgICB2b2lkIHNldEFj dGl2ZShib29sKTsKICAgICB2b2lkIHNldEZvY3VzZWQoYm9vbCk7CiAgICAgdm9pZCBzZXRJbml0 aWFsRm9jdXMoYm9vbCk7CkBAIC0zODIsNyArMzgyLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAg ICAgdWludDY0X3QgcmVzdG9yZVNlc3Npb24oY29uc3QgU2Vzc2lvblN0YXRlJik7Ci0gICAgdm9p ZCByZXN0b3JlU2Vzc2lvbkFuZE5hdmlnYXRlVG9DdXJyZW50SXRlbShjb25zdCBTZXNzaW9uU3Rh dGUmKTsKKyAgICB2b2lkIHJlc3RvcmVTZXNzaW9uQW5kTmF2aWdhdGVUb0N1cnJlbnRJdGVtKGNv bnN0IFNlc3Npb25TdGF0ZSYsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOwogCiAg ICAgdm9pZCBkaWRSZW1vdmVCYWNrRm9yd2FyZEl0ZW0odWludDY0X3QpOwogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgkocmV2aXNpb24gNzgzOTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNDIsOSArNDIsOSBAQCBt ZXNzYWdlcyAtPiBXZWJQYWdlIHsKICAgICBUb3VjaEV2ZW50KFdlYktpdDo6V2ViVG91Y2hFdmVu dCBldmVudCkKICNlbmRpZgogCi0gICAgR29CYWNrKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlE KQotICAgIEdvRm9yd2FyZCh1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCkKLSAgICBHb1RvQmFj a0ZvcndhcmRJdGVtKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQorICAgIEdvQmFjayh1aW50 NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUg c2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKKyAgICBHb0ZvcndhcmQodWludDY0X3QgYmFja0Zvcndh cmRJdGVtSUQsIFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNp b25IYW5kbGUpCisgICAgR29Ub0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBiYWNrRm9yd2FyZEl0 ZW1JRCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhh bmRsZSkKICAgICBMb2FkSFRNTFN0cmluZyhXVEY6OlN0cmluZyBodG1sU3RyaW5nLCBXVEY6OlN0 cmluZyBiYXNlVVJMKQogICAgIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKFdURjo6U3RyaW5nIGh0 bWxTdHJpbmcsIFdURjo6U3RyaW5nIGJhc2VVUkwsIFdURjo6U3RyaW5nIHVucmVhY2hhYmxlVVJM KTsgCiAgICAgTG9hZFBsYWluVGV4dFN0cmluZyhXVEY6OlN0cmluZyBzdHJpbmcpCkBAIC01NSw3 ICs1NSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogCiAgICAgU3RvcExvYWRpbmdGcmFtZSh1 aW50NjRfdCBmcmFtZUlEKQogICAgIAotICAgIFJlc3RvcmVTZXNzaW9uQW5kTmF2aWdhdGVUb0N1 cnJlbnRJdGVtKFdlYktpdDo6U2Vzc2lvblN0YXRlIHN0YXRlKQorICAgIFJlc3RvcmVTZXNzaW9u QW5kTmF2aWdhdGVUb0N1cnJlbnRJdGVtKFdlYktpdDo6U2Vzc2lvblN0YXRlIHN0YXRlLCBXZWJL aXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQogCiAg ICAgRGlkUmVtb3ZlQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQog Cg==