140844 2015-01-23 15:56:47 -0800 Implement cache size limit 2022-10-25 13:25:13 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto koivisto ahmad.saleem792 oldest_to_newest 1063797 0 koivisto 2015-01-23 15:56:47 -0800 Don't grow without limits. 1063800 1 245257 koivisto 2015-01-23 16:13:12 -0800 Created attachment 245257 Patch 1063837 2 245257 kling 2015-01-23 17:24:00 -0800 Comment on attachment 245257 Patch r=me 1063838 3 245257 cdumez 2015-01-23 17:27:08 -0800 Comment on attachment 245257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245257&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:448 > + m_maximumSize = 90 << 20; What is this? m_maximumSize is initialized twice in a row. 1063839 4 245257 kling 2015-01-23 17:30:49 -0800 Comment on attachment 245257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245257&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:502 > + unlink(path.data()); Don't we have a WebCore abstraction for this? 1908206 5 ahmad.saleem792 2022-10-25 13:25:13 -0700 Landed and didn't backed out - https://github.com/WebKit/WebKit/commit/5a15d2a371ed6d244e4bcf6b2d4fc6d029496ce9 Marking this as "RESOLVED FIXED". 245257 2015-01-23 16:13:12 -0800 2015-01-23 17:24:00 -0800 Patch bug-140844-20150123161311.patch text/plain 7314 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTAzNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAxLTIzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnQgY2FjaGUgc2l6 ZSBsaW1pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQwODQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UHJldmVudCB0aGUgY2FjaGUgZnJvbSBncm93aW5nIHdpdGhvdXQgYm91bmRzLiBUaGUgc2ltcGxl IHNjaGVtZSBpbXBsZW1lbnRlZCBoZXJlCisgICAgICAgIGVzdGltYXRlcyB0aGUgY2FjaGUgc2l6 ZSBmcm9tIG51bWJlciBvZiBlbnRyaWVzLiBXaGVuIHRoZSBlc3RpbWF0ZWQgc2l6ZSBleGNlZWRz CisgICAgICAgIHRoZSBtYXhpbXVtIHNpemUgd2UgcmFuZG9tbHkgY2xlYXIgMS80IG9mIHRoZSBl bnRyaWVzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3Jh Z2VDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6TmV0d29y a0NhY2hlU3RvcmFnZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6Omlu aXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpyZW1vdmVF bnRyeSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OnN0b3JlKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6c2V0TWF4aW11bVNpemUpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpjbGVhcik6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OnNocmlua0lmTmVlZGVkKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6aW5pdGlhbGl6ZUtleUZpbHRlcik6IERlbGV0ZWQuCisK IDIwMTUtMDEtMjMgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCB0aGUgcHJlLVlvc2VtaXRlIGJ1aWxkLgpJbmRleDogU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3Jh Z2UuaAkocmV2aXNpb24gMTc4OTM5KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw3ICs5Niw4 IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgTmV0d29ya0NhY2hlU3RvcmFnZShjb25zdCBTdHJp bmcmIGRpcmVjdG9yeVBhdGgpOwogCi0gICAgdm9pZCBpbml0aWFsaXplS2V5RmlsdGVyKCk7Cisg ICAgdm9pZCBpbml0aWFsaXplKCk7CisgICAgdm9pZCBzaHJpbmtJZk5lZWRlZCgpOwogCiAgICAg dm9pZCByZW1vdmVFbnRyeShjb25zdCBOZXR3b3JrQ2FjaGVLZXkmKTsKIApAQCAtMTEyLDYgKzEx Myw4IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fbWF4aW11bVNpemU7CiAKICAgICBCbG9vbUZp bHRlcjwyMD4gbV9rZXlGaWx0ZXI7CisgICAgc3RkOjphdG9taWM8c2l6ZV90PiBtX2FwcHJveGlt YXRlRW50cnlDb3VudDsKKyAgICBzdGQ6OmF0b21pYzxib29sPiBtX3Nocmlua0luUHJvZ3Jlc3M7 CiAKICAgICBWZWN0b3I8RGVxdWU8UmV0cmlldmVPcGVyYXRpb24+PiBtX3BlbmRpbmdSZXRyaWV2 ZU9wZXJhdGlvbnNCeVByaW9yaXR5OwogICAgIHVuc2lnbmVkIG1fYWN0aXZlUmV0cmlldmVPcGVy YXRpb25Db3VudDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2VDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2EubW0JKHJldmlzaW9u IDE3ODkzOSkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZVN0b3JhZ2VDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI5LDIzICsxMjksMjUgQEAg TmV0d29ya0NhY2hlU3RvcmFnZTo6TmV0d29ya0NhY2hlU3RvcmFnZQogewogICAgIGRpc3BhdGNo X3NldF90YXJnZXRfcXVldWUobV9iYWNrZ3JvdW5kSU9RdWV1ZS5nZXQoKSwgZGlzcGF0Y2hfZ2V0 X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9CQUNLR1JPVU5ELCAwKSk7CiAK LSAgICBpbml0aWFsaXplS2V5RmlsdGVyKCk7CisgICAgaW5pdGlhbGl6ZSgpOwogfQogCi12b2lk IE5ldHdvcmtDYWNoZVN0b3JhZ2U6OmluaXRpYWxpemVLZXlGaWx0ZXIoKQordm9pZCBOZXR3b3Jr Q2FjaGVTdG9yYWdlOjppbml0aWFsaXplKCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOwogCiAgICAgU3RyaW5nQ2FwdHVyZSBjYWNoZVBhdGhDYXB0dXJlKG1fZGlyZWN0b3J5UGF0 aCk7CiAgICAgYXV0byYga2V5RmlsdGVyID0gbV9rZXlGaWx0ZXI7CisgICAgYXV0byYgZW50cnlD b3VudCA9IG1fYXBwcm94aW1hdGVFbnRyeUNvdW50OwogCi0gICAgZGlzcGF0Y2hfYXN5bmMobV9i YWNrZ3JvdW5kSU9RdWV1ZS5nZXQoKSwgW2NhY2hlUGF0aENhcHR1cmUsICZrZXlGaWx0ZXJdIHsK KyAgICBkaXNwYXRjaF9hc3luYyhtX2JhY2tncm91bmRJT1F1ZXVlLmdldCgpLCBbY2FjaGVQYXRo Q2FwdHVyZSwgJmtleUZpbHRlciwgJmVudHJ5Q291bnRdIHsKICAgICAgICAgU3RyaW5nIGNhY2hl UGF0aCA9IGNhY2hlUGF0aENhcHR1cmUuc3RyaW5nKCk7Ci0gICAgICAgIHRyYXZlcnNlQ2FjaGVG aWxlcyhjYWNoZVBhdGgsIFsma2V5RmlsdGVyXShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25z dCBTdHJpbmcmKSB7CisgICAgICAgIHRyYXZlcnNlQ2FjaGVGaWxlcyhjYWNoZVBhdGgsIFsma2V5 RmlsdGVyLCAmZW50cnlDb3VudF0oY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgY29uc3QgU3RyaW5n JikgewogICAgICAgICAgICAgTmV0d29ya0NhY2hlS2V5OjpIYXNoVHlwZSBoYXNoOwogICAgICAg ICAgICAgaWYgKCFOZXR3b3JrQ2FjaGVLZXk6OnN0cmluZ1RvSGFzaChmaWxlTmFtZSwgaGFzaCkp CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAga2V5RmlsdGVyLmFkZChoYXNo KTsKKyAgICAgICAgICAgICsrZW50cnlDb3VudDsKICAgICAgICAgfSk7CiAgICAgfSk7CiB9CkBA IC0zNDMsOSArMzQ1LDExIEBAIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6cmVtb3ZlRW50cnko Y28KICAgICAgICAgbV9rZXlGaWx0ZXIucmVtb3ZlKGtleS5oYXNoKCkpOwogCiAgICAgU3RyaW5n Q2FwdHVyZSBmaWxlUGF0aENhcHR1cmUoZmlsZVBhdGhGb3JLZXkoa2V5LCBtX2RpcmVjdG9yeVBh dGgpKTsKLSAgICBkaXNwYXRjaF9hc3luYyhtX2lvUXVldWUuZ2V0KCksIFtmaWxlUGF0aENhcHR1 cmVdIHsKKyAgICBkaXNwYXRjaF9hc3luYyhtX2lvUXVldWUuZ2V0KCksIFt0aGlzLCBmaWxlUGF0 aENhcHR1cmVdIHsKICAgICAgICAgQ1N0cmluZyBwYXRoID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKGZpbGVQYXRoQ2FwdHVyZS5zdHJpbmcoKSk7CiAgICAgICAgIHVubGluayhw YXRoLmRhdGEoKSk7CisgICAgICAgIGlmIChtX2FwcHJveGltYXRlRW50cnlDb3VudCkKKyAgICAg ICAgICAgIC0tbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ7CiAgICAgfSk7CiB9CiAKQEAgLTQyNyw4 ICs0MzEsMTEgQEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzdG9yZShjb25zdCBOZQogICAg ICAgICBkaXNwYXRjaF9pb193cml0ZShjaGFubmVsLmdldCgpLCAwLCBkYXRhLmdldCgpLCBkaXNw YXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbdGhpcywga2V5LCBjb21wbGV0aW9uSGFuZGxlcl0oYm9v bCBkb25lLCBkaXNwYXRjaF9kYXRhX3QsIGludCBlcnJvcikgewogICAgICAgICAgICAgQVNTRVJU X1VOVVNFRChkb25lLCBkb25lKTsKICAgICAgICAgICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdl LCAiKE5ldHdvcmtQcm9jZXNzKSB3cml0ZSBjb21wbGV0ZSBlcnJvcj0lZCIsIGVycm9yKTsKLSAg ICAgICAgICAgIGlmICghZXJyb3IpCisgICAgICAgICAgICBpZiAoIWVycm9yKSB7CiAgICAgICAg ICAgICAgICAgbV9rZXlGaWx0ZXIuYWRkKGtleS5oYXNoKCkpOworICAgICAgICAgICAgICAgICsr bV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ7CisgICAgICAgICAgICAgICAgc2hyaW5rSWZOZWVkZWQo KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCFlcnJvcik7 CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtNDM3LDggKzQ0NCwxMCBAQCB2b2lkIE5ldHdvcmtD YWNoZVN0b3JhZ2U6OnN0b3JlKGNvbnN0IE5lCiB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OnNl dE1heGltdW1TaXplKHNpemVfdCBzaXplKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4o KSk7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KICAgICBtX21heGltdW1TaXplID0gc2l6ZTsK KyAgICBtX21heGltdW1TaXplID0gOTAgPDwgMjA7CisKKyAgICBzaHJpbmtJZk5lZWRlZCgpOwog fQogCiB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNsZWFyKCkKQEAgLTQ0Nyw2ICs0NTYsNyBA QCB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNsZWFyKCkKICAgICBMT0coTmV0d29ya0NhY2hl U3RvcmFnZSwgIihOZXR3b3JrUHJvY2VzcykgY2xlYXJpbmcgY2FjaGUiKTsKIAogICAgIG1fa2V5 RmlsdGVyLmNsZWFyKCk7CisgICAgbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQgPSAwOwogCiAgICAg U3RyaW5nQ2FwdHVyZSBkaXJlY3RvcnlQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBhdGgpOwogCkBA IC00NjMsNiArNDczLDUwIEBAIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6Y2xlYXIoKQogICAg IH0pOwogfQogCit2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OnNocmlua0lmTmVlZGVkKCkKK3sK KyAgICBjb25zdCBzaXplX3QgYXNzdW1lZEF2ZXJhZ2VSZXNvdXJjZVNpemUgeyA0OCAqIDEwMjQg fTsKKyAgICBjb25zdCBzaXplX3QgZXZlcnlOdGhSZXNvdXJjZVRvRGVsZXRlIHsgNCB9OworCisg ICAgc2l6ZV90IGVzdGltYXRlZENhY2hlU2l6ZSA9IGFzc3VtZWRBdmVyYWdlUmVzb3VyY2VTaXpl ICogbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ7CisKKyAgICBpZiAoZXN0aW1hdGVkQ2FjaGVTaXpl IDw9IG1fbWF4aW11bVNpemUpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAobV9zaHJpbmtJblBy b2dyZXNzKQorICAgICAgICByZXR1cm47CisgICAgbV9zaHJpbmtJblByb2dyZXNzID0gdHJ1ZTsK KworICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBzaHJpbmtp bmcgY2FjaGUgbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ9JWQgZXN0aW1hdGVkQ2FjaGVTaXplPSVk LCBtX21heGltdW1TaXplPSVkIiwgc3RhdGljX2Nhc3Q8c2l6ZV90PihtX2FwcHJveGltYXRlRW50 cnlDb3VudCksIGVzdGltYXRlZENhY2hlU2l6ZSwgbV9tYXhpbXVtU2l6ZSk7CisKKyAgICBTdHJp bmdDYXB0dXJlIGNhY2hlUGF0aENhcHR1cmUobV9kaXJlY3RvcnlQYXRoKTsKKworICAgIGRpc3Bh dGNoX2FzeW5jKG1fYmFja2dyb3VuZElPUXVldWUuZ2V0KCksIFt0aGlzLCBjYWNoZVBhdGhDYXB0 dXJlXSB7CisgICAgICAgIFN0cmluZyBjYWNoZVBhdGggPSBjYWNoZVBhdGhDYXB0dXJlLnN0cmlu ZygpOworICAgICAgICBzaXplX3QgY291bnRlZEVudHJ5Q291bnQgPSAwOworICAgICAgICBzaXpl X3QgZGVsZXRlZENvdW50ID0gMDsKKyAgICAgICAgdHJhdmVyc2VDYWNoZUZpbGVzKGNhY2hlUGF0 aCwgW3RoaXMsICZjb3VudGVkRW50cnlDb3VudCwgJmRlbGV0ZWRDb3VudF0oY29uc3QgU3RyaW5n JiBmaWxlTmFtZSwgY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpIHsKKyAgICAgICAgICAgIFN0cmlu ZyBwYXJ0aXRpb25QYXRoID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGRpcmVj dG9yeSwgZmlsZU5hbWUpOworICAgICAgICAgICAgQ1N0cmluZyBwYXRoID0gV2ViQ29yZTo6Zmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhcnRpdGlvblBhdGgpOworICAgICAgICAgICAgKytjb3Vu dGVkRW50cnlDb3VudDsKKyAgICAgICAgICAgIGlmICghKGNvdW50ZWRFbnRyeUNvdW50ICUgZXZl cnlOdGhSZXNvdXJjZVRvRGVsZXRlKSkgeworICAgICAgICAgICAgICAgIHVubGluayhwYXRoLmRh dGEoKSk7CisgICAgICAgICAgICAgICAgKytkZWxldGVkQ291bnQ7CisKKyAgICAgICAgICAgICAg ICBOZXR3b3JrQ2FjaGVLZXk6Okhhc2hUeXBlIGhhc2g7CisgICAgICAgICAgICAgICAgaWYgKCFO ZXR3b3JrQ2FjaGVLZXk6OnN0cmluZ1RvSGFzaChmaWxlTmFtZSwgaGFzaCkpCisgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRj aF9nZXRfbWFpbl9xdWV1ZSgpLCBbdGhpcywgaGFzaF0geworICAgICAgICAgICAgICAgICAgICBp ZiAobV9rZXlGaWx0ZXIubWF5Q29udGFpbihoYXNoKSkKKyAgICAgICAgICAgICAgICAgICAgICAg IG1fa2V5RmlsdGVyLnJlbW92ZShoYXNoKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSk7CisgICAgICAgIG1fYXBwcm94aW1hdGVFbnRyeUNvdW50ID0gY291 bnRlZEVudHJ5Q291bnQgLSBkZWxldGVkQ291bnQ7CisgICAgICAgIExPRyhOZXR3b3JrQ2FjaGVT dG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBjYWNoZSBzaHJpbmsgY29tcGxldGVkIG1fYXBwcm94 aW1hdGVFbnRyeUNvdW50PSVkIiwgc3RhdGljX2Nhc3Q8c2l6ZV90PihtX2FwcHJveGltYXRlRW50 cnlDb3VudCkpOworICAgICAgICBtX3Nocmlua0luUHJvZ3Jlc3MgPSBmYWxzZTsKKyAgICB9KTsK K30KKwogfQogCiAjZW5kaWYK