165192 2016-11-30 03:37:06 -0800 Make ApplicationCacheHost::maybeLoadSynchronously more robust 2017-01-12 15:13:24 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf achristensen cdumez commit-queue dbates japhet krollin oldest_to_newest 1254736 0 youennf 2016-11-30 03:37:06 -0800 In case out parameter "data" is not null and shouldLoadResourceFromApplicationCache returns false and resource is null, we might dereference a null pointer. "data" out parameter cannot be null right now but we should not expect callers to always do that 1254737 1 295712 youennf 2016-11-30 03:39:57 -0800 Created attachment 295712 Patch 1266289 2 295712 achristensen 2017-01-12 14:33:04 -0800 Comment on attachment 295712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295712&action=review We should also stop using ResourceHandle directly with ApplicationCacheGroup > Source/WebCore/ChangeLog:10 > + We refactor the code to ensure that this case cannot happen anymore. If it can happen now, we should add a test that reproduces it before this change. 1266291 3 youennf 2017-01-12 14:35:26 -0800 (In reply to comment #2) > Comment on attachment 295712 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=295712&action=review > > We should also stop using ResourceHandle directly with ApplicationCacheGroup > > > Source/WebCore/ChangeLog:10 > > + We refactor the code to ensure that this case cannot happen anymore. > > If it can happen now, we should add a test that reproduces it before this > change. I don't think this can happen. This change is coming from discussions with Keith based on some static analysis he did. 1266319 4 295712 commit-queue 2017-01-12 15:13:18 -0800 Comment on attachment 295712 Patch Clearing flags on attachment: 295712 Committed r210682: <http://trac.webkit.org/changeset/210682> 1266320 5 commit-queue 2017-01-12 15:13:24 -0800 All reviewed patches have been landed. Closing bug. 295712 2016-11-30 03:39:57 -0800 2017-01-12 15:13:18 -0800 Patch bug-165192-20161130123930.patch text/plain 3361 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzE1YzNiYTRiMzAxMzFk NmJlZTU0MzI2MzVkMzY1MGY2MTBiMjdjNC4uYjZkZGRjYWVjNGIxNjRjMzRmZjhiOTFmM2NiN2E5 YWRhNWVmMDY1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTExLTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIEFwcGxpY2F0aW9u Q2FjaGVIb3N0OjptYXliZUxvYWRTeW5jaHJvbm91c2x5IG1vcmUgcm9idXN0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUxOTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZp b3IuCisgICAgICAgIEN1cnJlbnRseSwgaW4gY2FzZSBvdXQgcGFyYW1ldGVyICJkYXRhIiBpcyBu b3QgbnVsbCBhbmQgc2hvdWxkTG9hZFJlc291cmNlRnJvbUFwcGxpY2F0aW9uQ2FjaGUgcmV0dXJu cyBmYWxzZSBhbmQgcmVzb3VyY2UgaXMgbnVsbCwgd2UgbWlnaHQgZGVyZWZlcmVuY2UgYSBudWxs IHBvaW50ZXIgd2hlbiBjYWxsaW5nIG1heWJlTG9hZFN5bmNocm9ub3VzbHkuCisgICAgICAgIFdl IHJlZmFjdG9yIHRoZSBjb2RlIHRvIGVuc3VyZSB0aGF0IHRoaXMgY2FzZSBjYW5ub3QgaGFwcGVu IGFueW1vcmUuCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhv c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVmZmVyRnJvbVJlc291cmNlKToKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjptYXliZUxvYWRTeW5jaHJvbm91c2x5KToK KwogMjAxNi0xMS0yNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl bW92ZSB1bnVzZWQgRE9NUmVxdWVzdFN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVIb3N0LmNwcAppbmRleCBhYjc0ZWM1MWM4 ODU0ZjQwNWYzY2IwMDU4NTU2ZWJkOTc3OWY2MDUzLi43ZjUwMDRjOTg5Zjk5ZTNlZTc1ZWY1ZDlm YzY1OWZlYTVkNGVjODNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2Fj aGUvQXBwbGljYXRpb25DYWNoZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlSG9zdC5jcHAKQEAgLTIzMSwyNSArMjMxLDMwIEBAIFVS TCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6Y3JlYXRlRmlsZVVSTChjb25zdCBTdHJpbmcmIHBhdGgp CiAgICAgcmV0dXJuIHVybDsKIH0KIAorc3RhdGljIGlubGluZSBSZWZQdHI8U2hhcmVkQnVmZmVy PiBidWZmZXJGcm9tUmVzb3VyY2UoQXBwbGljYXRpb25DYWNoZVJlc291cmNlJiByZXNvdXJjZSkK K3sKKyAgICAvLyBGSVhNRTogQ2xpZW50cyBwcm9iYWJseSBkbyBub3QgbmVlZCBhIGNvcHkgb2Yg dGhlIFNoYXJlZEJ1ZmZlci4KKyAgICAvLyBSZW1vdmUgdGhlIGNhbGwgdG8gY29weSgpIG9uY2Ug d2UgZW5zdXJlIFNoYXJlZEJ1ZmZlciB3aWxsIG5vdCBiZSBtb2RpZmllZC4KKyAgICBpZiAocmVz b3VyY2UucGF0aCgpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIHJlc291cmNlLmRhdGEoKS5j b3B5KCk7CisgICAgcmV0dXJuIFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlV2l0aENvbnRlbnRzT2ZGaWxl KHJlc291cmNlLnBhdGgoKSk7Cit9CisKIGJvb2wgQXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJl TG9hZFN5bmNocm9ub3VzbHkoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUVycm9y JiBlcnJvciwgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIFJlZlB0cjxTaGFyZWRCdWZmZXI+ JiBkYXRhKQogewogICAgIEFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZSogcmVzb3VyY2U7Ci0gICAg aWYgKHNob3VsZExvYWRSZXNvdXJjZUZyb21BcHBsaWNhdGlvbkNhY2hlKHJlcXVlc3QsIHJlc291 cmNlKSkgewotICAgICAgICBpZiAocmVzb3VyY2UpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBD bGllbnRzIHByb2FibHkgZG8gbm90IG5lZWQgYSBjb3B5IG9mIHRoZSBTaGFyZWRCdWZmZXIuCi0g ICAgICAgICAgICAvLyBSZW1vdmUgdGhlIGNhbGwgdG8gY29weSgpIG9uY2Ugd2UgZW5zdXJlIFNo YXJlZEJ1ZmZlciB3aWxsIG5vdCBiZSBtb2RpZmllZC4KLSAgICAgICAgICAgIGlmIChyZXNvdXJj ZS0+cGF0aCgpLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBkYXRhID0gcmVzb3VyY2UtPmRh dGEoKS5jb3B5KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgZGF0YSA9IFNo YXJlZEJ1ZmZlcjo6Y3JlYXRlV2l0aENvbnRlbnRzT2ZGaWxlKHJlc291cmNlLT5wYXRoKCkpOwot ICAgICAgICB9Ci0gICAgICAgIGlmICghZGF0YSkKLSAgICAgICAgICAgIGVycm9yID0gbV9kb2N1 bWVudExvYWRlci5mcmFtZUxvYWRlcigpLT5jbGllbnQoKS5jYW5ub3RTaG93VVJMRXJyb3IocmVx dWVzdCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHJlc3BvbnNlID0gcmVzb3VyY2UtPnJl c3BvbnNlKCk7CisgICAgaWYgKCFzaG91bGRMb2FkUmVzb3VyY2VGcm9tQXBwbGljYXRpb25DYWNo ZShyZXF1ZXN0LCByZXNvdXJjZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IHJlc3BvbnNlRGF0YSA9IHJlc291cmNlID8gYnVmZmVyRnJvbVJlc291 cmNlKCpyZXNvdXJjZSkgOiBudWxscHRyOworICAgIGlmICghcmVzcG9uc2VEYXRhKSB7CisgICAg ICAgIGVycm9yID0gbV9kb2N1bWVudExvYWRlci5mcmFtZUxvYWRlcigpLT5jbGllbnQoKS5jYW5u b3RTaG93VVJMRXJyb3IocmVxdWVzdCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KLSAg ICByZXR1cm4gZmFsc2U7CisKKyAgICByZXNwb25zZSA9IHJlc291cmNlLT5yZXNwb25zZSgpOwor ICAgIGRhdGEgPSBXVEZNb3ZlKHJlc3BvbnNlRGF0YSk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAK IHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZEZhbGxiYWNrU3luY2hyb25vdXNs eShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlRXJyb3ImIGVycm9yLCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4mIGRhdGEpCg==