145880 2015-06-11 08:19:23 -0700 Use SHA1 for cache coder checksums 2015-06-12 03:59:03 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cdumez cgarcia commit-queue oldest_to_newest 1101278 0 koivisto 2015-06-11 08:19:23 -0700 More robust error detection. 1101293 1 254724 koivisto 2015-06-11 08:53:19 -0700 Created attachment 254724 patch 1101534 2 koivisto 2015-06-12 03:59:03 -0700 https://trac.webkit.org/r185497 254724 2015-06-11 08:53:19 -0700 2015-06-11 09:41:16 -0700 patch disk-cache-coder-sha1.patch text/plain 7510 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTQ1NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA2LTExICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgU0hBMSBmb3IgY2FjaGUg Y29kZXIgY2hlY2tzdW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDU4ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNYWtlIGNhY2hlIGRhdGEgZXJyb3IgZGV0ZWN0aW9uIG1vcmUgcm9idXN0IGJ5IHVz aW5nIFNIQTEgZm9yIGNoZWNrc3Vtcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkRlY29kZXI6OkRlY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkRlY29k ZXI6OmRlY29kZUZpeGVkTGVuZ3RoRGF0YSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6RGVjb2Rlcjo6ZGVjb2RlTnVtYmVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl OjpEZWNvZGVyOjp2ZXJpZnlDaGVja3N1bSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlRGVjb2Rlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVuY29kZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkVuY29kZXI6OkVuY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkVuY29k ZXI6Omdyb3cpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkVuY29kZXI6OnVwZGF0 ZUNoZWNrc3VtRm9yRGF0YSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RW5jb2Rl cjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl OjpFbmNvZGVyOjplbmNvZGVOdW1iZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkVuY29kZXI6OmVuY29kZUNoZWNrc3VtKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVFbmNvZGVyLmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 RW5jb2Rlcjo6YnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpFbmNvZGVy OjpidWZmZXJTaXplKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpFbmNvZGVyOjp1 cGRhdGVDaGVja3N1bUZvck51bWJlcik6CisKIDIwMTUtMDYtMTEgIEFudHRpIEtvaXZpc3RvICA8 YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIDMlIGNvbGQgUExUIHJlZ3Jlc3Npb24gZnJvbSBu ZXR3b3JrIGNhY2hlIG9uIGlPUwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRGVjb2Rlci5jcHAJKHJldmlzaW9u IDE4NTQxMCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZURlY29kZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIERlY29kZXI6 OkRlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCAKICAgICA6IG1fYnVmZmVyKGJ1ZmZlcikK ICAgICAsIG1fYnVmZmVyUG9zaXRpb24oYnVmZmVyKQogICAgICwgbV9idWZmZXJFbmQoYnVmZmVy ICsgYnVmZmVyU2l6ZSkKLSAgICAsIG1fY2hlY2tzdW0oMCkKIHsKIH0KIApAQCAtNTgsNyArNTcs NyBAQCBib29sIERlY29kZXI6OmRlY29kZUZpeGVkTGVuZ3RoRGF0YSh1aW50CiAgICAgbWVtY3B5 KGRhdGEsIG1fYnVmZmVyUG9zaXRpb24sIHNpemUpOwogICAgIG1fYnVmZmVyUG9zaXRpb24gKz0g c2l6ZTsKIAotICAgIEVuY29kZXI6OnVwZGF0ZUNoZWNrc3VtRm9yRGF0YShtX2NoZWNrc3VtLCBk YXRhLCBzaXplKTsKKyAgICBFbmNvZGVyOjp1cGRhdGVDaGVja3N1bUZvckRhdGEobV9zaGExLCBk YXRhLCBzaXplKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNzEsNyArNzAsNyBAQCBib29s IERlY29kZXI6OmRlY29kZU51bWJlcihUeXBlJiB2YWx1ZSkKICAgICBtZW1jcHkoJnZhbHVlLCBt X2J1ZmZlclBvc2l0aW9uLCBzaXplb2YodmFsdWUpKTsKICAgICBtX2J1ZmZlclBvc2l0aW9uICs9 IHNpemVvZihUeXBlKTsKIAotICAgIEVuY29kZXI6OnVwZGF0ZUNoZWNrc3VtRm9yTnVtYmVyKG1f Y2hlY2tzdW0sIHZhbHVlKTsKKyAgICBFbmNvZGVyOjp1cGRhdGVDaGVja3N1bUZvck51bWJlciht X3NoYTEsIHZhbHVlKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTIyLDExICsxMjEsMTQg QEAgYm9vbCBEZWNvZGVyOjpkZWNvZGUoZG91YmxlJiByZXN1bHQpCiAKIGJvb2wgRGVjb2Rlcjo6 dmVyaWZ5Q2hlY2tzdW0oKQogewotICAgIHVuc2lnbmVkIGNvbXB1dGVkQ2hlY2tzdW0gPSBtX2No ZWNrc3VtOwotICAgIHVuc2lnbmVkIGRlY29kZWRDaGVja3N1bTsKLSAgICBpZiAoIWRlY29kZU51 bWJlcihkZWNvZGVkQ2hlY2tzdW0pKQorICAgIFNIQTE6OkRpZ2VzdCBjb21wdXRlZEhhc2g7Cisg ICAgbV9zaGExLmNvbXB1dGVIYXNoKGNvbXB1dGVkSGFzaCk7CisKKyAgICBTSEExOjpEaWdlc3Qg c2F2ZWRIYXNoOworICAgIGlmICghZGVjb2RlRml4ZWRMZW5ndGhEYXRhKHNhdmVkSGFzaC5kYXRh KCksIHNpemVvZihzYXZlZEhhc2gpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVy biBjb21wdXRlZENoZWNrc3VtID09IGRlY29kZWRDaGVja3N1bTsKKworICAgIHJldHVybiBjb21w dXRlZEhhc2ggPT0gc2F2ZWRIYXNoOwogfQogCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEZWNvZGVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRGVjb2Rlci5oCShy ZXZpc2lvbiAxODU0MTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVEZWNvZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNp ZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKIAogI2luY2x1ZGUgIk5ldHdvcmtDYWNoZUNvZGVyLmgi CisjaW5jbHVkZSA8d3RmL1NIQTEuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiBuYW1lc3BhY2Ug TmV0d29ya0NhY2hlIHsKQEAgLTk1LDcgKzk2LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCB1aW50 OF90KiBtX2J1ZmZlclBvc2l0aW9uOwogICAgIGNvbnN0IHVpbnQ4X3QqIG1fYnVmZmVyRW5kOwog Ci0gICAgdW5zaWduZWQgbV9jaGVja3N1bTsKKyAgICBTSEExIG1fc2hhMTsKIH07CiAKIH0gCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbmNv ZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVFbmNvZGVyLmNwcAkocmV2aXNpb24gMTg1NDEwKQorKysgU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW5jb2Rlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMyLDcgKzMyLDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBuYW1lc3BhY2Ug TmV0d29ya0NhY2hlIHsKIAogRW5jb2Rlcjo6RW5jb2RlcigpCi0gICAgOiBtX2NoZWNrc3VtKDAp CiB7CiB9CiAKQEAgLTQ3LDE3ICs0NiwxNiBAQCB1aW50OF90KiBFbmNvZGVyOjpncm93KHNpemVf dCBzaXplKQogICAgIHJldHVybiBtX2J1ZmZlci5kYXRhKCkgKyBuZXdQb3NpdGlvbjsKIH0KIAot dm9pZCBFbmNvZGVyOjp1cGRhdGVDaGVja3N1bUZvckRhdGEodW5zaWduZWQmIGNoZWNrc3VtLCBj b25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSkKK3ZvaWQgRW5jb2Rlcjo6dXBkYXRlQ2hl Y2tzdW1Gb3JEYXRhKFNIQTEmIHNoYTEsIGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBzaXpl KQogewotICAgIC8vIEZJWE1FOiBoYXNoTWVtb3J5IHNob3VsZCBub3QgcmVxdWlyZSBhbGlnbm1l bnQuCi0gICAgc2l6ZV90IGhhc2hTaXplID0gc2l6ZSAtIHNpemUgJSAyOwotICAgIHVuc2lnbmVk IGhhc2ggPSBTdHJpbmdIYXNoZXI6Omhhc2hNZW1vcnkoZGF0YSwgaGFzaFNpemUpIF4gRW5jb2Rl cjo6U2FsdDx1aW50OF90Kj46OnZhbHVlOwotICAgIGNoZWNrc3VtID0gV1RGOjpwYWlySW50SGFz aChjaGVja3N1bSwgaGFzaCk7CisgICAgYXV0byB0eXBlU2FsdCA9IFNhbHQ8dWludDhfdCo+Ojp2 YWx1ZTsKKyAgICBzaGExLmFkZEJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KCZ0eXBl U2FsdCksIHNpemVvZih0eXBlU2FsdCkpOworICAgIHNoYTEuYWRkQnl0ZXMoZGF0YSwgc2l6ZSk7 CiB9CiAKIHZvaWQgRW5jb2Rlcjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKGNvbnN0IHVpbnQ4X3Qq IGRhdGEsIHNpemVfdCBzaXplKQogewotICAgIHVwZGF0ZUNoZWNrc3VtRm9yRGF0YShtX2NoZWNr c3VtLCBkYXRhLCBzaXplKTsKKyAgICB1cGRhdGVDaGVja3N1bUZvckRhdGEobV9zaGExLCBkYXRh LCBzaXplKTsKIAogICAgIHVpbnQ4X3QqIGJ1ZmZlciA9IGdyb3coc2l6ZSk7CiAgICAgbWVtY3B5 KGJ1ZmZlciwgZGF0YSwgc2l6ZSk7CkBAIC02Niw3ICs2NCw3IEBAIHZvaWQgRW5jb2Rlcjo6ZW5j b2RlRml4ZWRMZW5ndGhEYXRhKGNvbnMKIHRlbXBsYXRlPHR5cGVuYW1lIFR5cGU+CiB2b2lkIEVu Y29kZXI6OmVuY29kZU51bWJlcihUeXBlIHZhbHVlKQogewotICAgIEVuY29kZXI6OnVwZGF0ZUNo ZWNrc3VtRm9yTnVtYmVyKG1fY2hlY2tzdW0sIHZhbHVlKTsKKyAgICBFbmNvZGVyOjp1cGRhdGVD aGVja3N1bUZvck51bWJlcihtX3NoYTEsIHZhbHVlKTsKIAogICAgIHVpbnQ4X3QqIGJ1ZmZlciA9 IGdyb3coc2l6ZW9mKFR5cGUpKTsKICAgICBtZW1jcHkoYnVmZmVyLCAmdmFsdWUsIHNpemVvZihU eXBlKSk7CkBAIC0xMTksNyArMTE3LDkgQEAgdm9pZCBFbmNvZGVyOjplbmNvZGUoZG91YmxlIHZh bHVlKQogCiB2b2lkIEVuY29kZXI6OmVuY29kZUNoZWNrc3VtKCkKIHsKLSAgICBlbmNvZGVOdW1i ZXIobV9jaGVja3N1bSk7CisgICAgU0hBMTo6RGlnZXN0IGhhc2g7CisgICAgbV9zaGExLmNvbXB1 dGVIYXNoKGhhc2gpOworICAgIGVuY29kZUZpeGVkTGVuZ3RoRGF0YShoYXNoLmRhdGEoKSwgaGFz aC5zaXplKCkpOwogfQogCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVFbmNvZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW5jb2Rlci5oCShyZXZpc2lvbiAxODU0 MTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVF bmNvZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDggKzI5LDcgQEAKICNpZiBFTkFCTEUoTkVU V09SS19DQUNIRSkKIAogI2luY2x1ZGUgIk5ldHdvcmtDYWNoZUNvZGVyLmgiCi0jaW5jbHVkZSA8 d3RmL0hhc2hGdW5jdGlvbnMuaD4KLSNpbmNsdWRlIDx3dGYvU3RyaW5nSGFzaGVyLmg+CisjaW5j bHVkZSA8d3RmL1NIQTEuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewpAQCAtNjksOCArNjgsOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgdWludDhfdCogYnVm ZmVyKCkgY29uc3QgeyByZXR1cm4gbV9idWZmZXIuZGF0YSgpOyB9CiAgICAgc2l6ZV90IGJ1ZmZl clNpemUoKSBjb25zdCB7IHJldHVybiBtX2J1ZmZlci5zaXplKCk7IH0KIAotICAgIHN0YXRpYyB2 b2lkIHVwZGF0ZUNoZWNrc3VtRm9yRGF0YSh1bnNpZ25lZCYgY2hlY2tzdW0sIGNvbnN0IHVpbnQ4 X3QqLCBzaXplX3QpOwotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUeXBlPiBzdGF0aWMgdm9pZCB1 cGRhdGVDaGVja3N1bUZvck51bWJlcih1bnNpZ25lZCYgY2hlY2tzdW0sIFR5cGUpOworICAgIHN0 YXRpYyB2b2lkIHVwZGF0ZUNoZWNrc3VtRm9yRGF0YShTSEExJiwgY29uc3QgdWludDhfdCosIHNp emVfdCk7CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFR5cGU+IHN0YXRpYyB2b2lkIHVwZGF0ZUNo ZWNrc3VtRm9yTnVtYmVyKFNIQTEmLCBUeXBlKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIGVuY29k ZShib29sKTsKQEAgLTkwLDcgKzg5LDcgQEAgcHJpdmF0ZToKICAgICB0ZW1wbGF0ZSA8dHlwZW5h bWUgVHlwZT4gc3RydWN0IFNhbHQ7CiAKICAgICBWZWN0b3I8dWludDhfdCwgNDA5Nj4gbV9idWZm ZXI7Ci0gICAgdW5zaWduZWQgbV9jaGVja3N1bTsKKyAgICBTSEExIG1fc2hhMTsKIH07CiAKIHRl bXBsYXRlIDw+IHN0cnVjdCBFbmNvZGVyOjpTYWx0PGJvb2w+IHsgc3RhdGljIGNvbnN0IHVuc2ln bmVkIHZhbHVlID0gMzsgfTsKQEAgLTEwNSwxMCArMTA0LDExIEBAIHRlbXBsYXRlIDw+IHN0cnVj dCBFbmNvZGVyOjpTYWx0PGRvdWJsZT4KIHRlbXBsYXRlIDw+IHN0cnVjdCBFbmNvZGVyOjpTYWx0 PHVpbnQ4X3QqPiB7IHN0YXRpYyBjb25zdCB1bnNpZ25lZCB2YWx1ZSA9IDEwMTsgfTsKIAogdGVt cGxhdGUgPHR5cGVuYW1lIFR5cGU+Ci12b2lkIEVuY29kZXI6OnVwZGF0ZUNoZWNrc3VtRm9yTnVt YmVyKHVuc2lnbmVkJiBjaGVja3N1bSwgVHlwZSB2YWx1ZSkKK3ZvaWQgRW5jb2Rlcjo6dXBkYXRl Q2hlY2tzdW1Gb3JOdW1iZXIoU0hBMSYgc2hhMSwgVHlwZSB2YWx1ZSkKIHsKLSAgICB1bnNpZ25l ZCBoYXNoID0gV1RGOjppbnRIYXNoKHN0YXRpY19jYXN0PHVpbnQ2NF90Pih2YWx1ZSkpIF4gRW5j b2Rlcjo6U2FsdDxUeXBlPjo6dmFsdWU7Ci0gICAgY2hlY2tzdW0gPSBXVEY6OnBhaXJJbnRIYXNo KGNoZWNrc3VtLCBoYXNoKTsKKyAgICBhdXRvIHR5cGVTYWx0ID0gU2FsdDxUeXBlPjo6dmFsdWU7 CisgICAgc2hhMS5hZGRCeXRlcyhyZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPigmdHlwZVNhbHQp LCBzaXplb2YodHlwZVNhbHQpKTsKKyAgICBzaGExLmFkZEJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8 dWludDhfdCo+KCZ2YWx1ZSksIHNpemVvZih2YWx1ZSkpOwogfQogCiB9Cg==