147562 2015-08-03 10:34:05 -0700 Make sure error handling code APIUserContentExtensionStore closes open file descriptors 2015-08-08 14:26:28 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen andersca benjamin cgarcia commit-queue koivisto sam oldest_to_newest 1114224 0 cdumez 2015-08-03 10:34:05 -0700 Make sure error handling code APIUserContentExtensionStore closes open file descriptors to avoid leaking them. 1114226 1 258074 cdumez 2015-08-03 10:35:38 -0700 Created attachment 258074 Patch 1114242 2 258081 cdumez 2015-08-03 11:03:43 -0700 Created attachment 258081 Patch 1114361 3 258081 achristensen 2015-08-03 14:24:12 -0700 Comment on attachment 258081 Patch r=me 1114365 4 258081 commit-queue 2015-08-03 14:30:49 -0700 Comment on attachment 258081 Patch Clearing flags on attachment: 258081 Committed r187765: <http://trac.webkit.org/changeset/187765> 1114366 5 commit-queue 2015-08-03 14:30:53 -0700 All reviewed patches have been landed. Closing bug. 1116043 6 258081 darin 2015-08-08 14:26:28 -0700 Comment on attachment 258081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258081&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp:87 > Data adoptAndMapFile(int fd, size_t offset, size_t size) Can we change the code to use a class that is like a smart pointer so we don’t have to do this kind of careful programming? It’s too easy to make these kinds of mistakes if we have to do it all manually. 258074 2015-08-03 10:35:38 -0700 2015-08-03 11:03:38 -0700 Patch bug-147562-20150803103533.patch text/plain 3268 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjlhYzJmN2JiMGU4NTgy YjE0MjMzZmMyOTE4NWZlY2Q2MGU5ZmY3YS4uN2VkNjkyNTZhNGY1YmFiZGY2NjVmOTc4MGUzMTk1 MGUxNTU5OGNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA4LTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIGVycm9yIGhh bmRsaW5nIGNvZGUgQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSBjbG9zZXMgb3BlbiBmaWxl IGRlc2NyaXB0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDc1NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIHN1cmUgZXJyb3IgaGFuZGxpbmcgY29kZSBBUElVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlIGNsb3NlcyBvcGVuCisgICAgICAgIGZpbGUgZGVzY3JpcHRvcnMgdG8gYXZvaWQgbGVh a2luZyB0aGVtLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6YWRvcHRBbmRNYXBGaWxl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUu Y3BwOgorICAgICAgICAoQVBJOjpjb21waWxlZFRvRmlsZSk6CisKIDIwMTUtMDgtMDMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIFVwZGF0ZSBPcHRpb25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjkuNSByZWxlYXNlLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVEYXRhLmNwcAppbmRleCAxYmY4OWY1ZDBiMGE2NWEwNWM1OGVkMzE2YTMyMzkxYTQxNzYx ZWQ5Li5kOWE0NzhiYjgwMzhhMmEzNDQzZDJjYzFjN2I1ZTJmMGY1MDBjZmE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVE YXRhLmNwcApAQCAtODYsOCArODYsMTAgQEAgRGF0YSBtYXBGaWxlKGNvbnN0IGNoYXIqIHBhdGgp CiAKIERhdGEgYWRvcHRBbmRNYXBGaWxlKGludCBmZCwgc2l6ZV90IG9mZnNldCwgc2l6ZV90IHNp emUpCiB7Ci0gICAgaWYgKCFzaXplKQorICAgIGlmICghc2l6ZSkgeworICAgICAgICBjbG9zZShm ZCk7CiAgICAgICAgIHJldHVybiBEYXRhOjplbXB0eSgpOworICAgIH0KIAogICAgIHZvaWQqIG1h cCA9IG1tYXAobnVsbHB0ciwgc2l6ZSwgUFJPVF9SRUFELCBNQVBfUFJJVkFURSwgZmQsIG9mZnNl dCk7CiAgICAgaWYgKG1hcCA9PSBNQVBfRkFJTEVEKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmNw cAppbmRleCBjODA4YjJlOTZiOGMxY2U4NDY5YTdlNmMwODQ4ZjkzMGFhZTMwMWZhLi5hZjNkZmM0 NjFhMGNjZTYyNGFhNDg1MDU4OTI2M2VjMjM5MTQyYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9y ZS5jcHAKQEAgLTI1MywxNSArMjUzLDIxIEBAIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgY29tcGls ZWRUb0ZpbGUoU3RyaW5nJiYganNvbiwgY29uc3QgU3RyaW5nJiBmaW5hbEZpbGVQYXRoCiAgICAg Y2hhciBpbnZhbGlkSGVhZGVyW0NvbnRlbnRFeHRlbnNpb25GaWxlSGVhZGVyU2l6ZV07CiAgICAg bWVtc2V0KGludmFsaWRIZWFkZXIsIDB4RkYsIHNpemVvZihpbnZhbGlkSGVhZGVyKSk7CiAgICAg Ly8gVGhpcyBoZWFkZXIgd2lsbCBiZSByZXdyaXR0ZW4gaW4gQ29tcGlsYXRpb25DbGllbnQ6OmZp bmFsaXplLgotICAgIGlmIChXZWJDb3JlOjp3cml0ZVRvRmlsZSh0ZW1wb3JhcnlGaWxlSGFuZGxl LCBpbnZhbGlkSGVhZGVyLCBzaXplb2YoaW52YWxpZEhlYWRlcikpID09IC0xKQorICAgIGlmIChX ZWJDb3JlOjp3cml0ZVRvRmlsZSh0ZW1wb3JhcnlGaWxlSGFuZGxlLCBpbnZhbGlkSGVhZGVyLCBz aXplb2YoaW52YWxpZEhlYWRlcikpID09IC0xKSB7CisgICAgICAgIGNsb3NlRmlsZSh0ZW1wb3Jh cnlGaWxlSGFuZGxlKTsKICAgICAgICAgcmV0dXJuIFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmU6 OkVycm9yOjpDb21waWxlRmFpbGVkOworICAgIH0KIAogICAgIENvbXBpbGF0aW9uQ2xpZW50IGNv bXBpbGF0aW9uQ2xpZW50KHRlbXBvcmFyeUZpbGVIYW5kbGUsIG1ldGFEYXRhKTsKICAgICAKLSAg ICBpZiAoYXV0byBjb21waWxlckVycm9yID0gY29tcGlsZVJ1bGVMaXN0KGNvbXBpbGF0aW9uQ2xp ZW50LCBXVEY6Om1vdmUoanNvbikpKQorICAgIGlmIChhdXRvIGNvbXBpbGVyRXJyb3IgPSBjb21w aWxlUnVsZUxpc3QoY29tcGlsYXRpb25DbGllbnQsIFdURjo6bW92ZShqc29uKSkpIHsKKyAgICAg ICAgY2xvc2VGaWxlKHRlbXBvcmFyeUZpbGVIYW5kbGUpOwogICAgICAgICByZXR1cm4gY29tcGls ZXJFcnJvcjsKLSAgICBpZiAoY29tcGlsYXRpb25DbGllbnQuaGFkRXJyb3JXaGlsZVdyaXRpbmdU b0ZpbGUoKSkKKyAgICB9CisgICAgaWYgKGNvbXBpbGF0aW9uQ2xpZW50LmhhZEVycm9yV2hpbGVX cml0aW5nVG9GaWxlKCkpIHsKKyAgICAgICAgY2xvc2VGaWxlKHRlbXBvcmFyeUZpbGVIYW5kbGUp OwogICAgICAgICByZXR1cm4gVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZTo6RXJyb3I6OkNvbXBp bGVGYWlsZWQ7CisgICAgfQogICAgIAogICAgIG1hcHBlZERhdGEgPSBhZG9wdEFuZE1hcEZpbGUo dGVtcG9yYXJ5RmlsZUhhbmRsZSwgMCwgbWV0YURhdGEuZmlsZVNpemUoKSk7CiAgICAgaWYgKG1h cHBlZERhdGEuaXNOdWxsKCkpCg== 258081 2015-08-03 11:03:43 -0700 2015-08-03 14:30:49 -0700 Patch bug-147562-20150803110337.patch text/plain 3295 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjlhYzJmN2JiMGU4NTgy YjE0MjMzZmMyOTE4NWZlY2Q2MGU5ZmY3YS4uN2VkNjkyNTZhNGY1YmFiZGY2NjVmOTc4MGUzMTk1 MGUxNTU5OGNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA4LTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIGVycm9yIGhh bmRsaW5nIGNvZGUgQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSBjbG9zZXMgb3BlbiBmaWxl IGRlc2NyaXB0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDc1NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIHN1cmUgZXJyb3IgaGFuZGxpbmcgY29kZSBBUElVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlIGNsb3NlcyBvcGVuCisgICAgICAgIGZpbGUgZGVzY3JpcHRvcnMgdG8gYXZvaWQgbGVh a2luZyB0aGVtLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6YWRvcHRBbmRNYXBGaWxl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUu Y3BwOgorICAgICAgICAoQVBJOjpjb21waWxlZFRvRmlsZSk6CisKIDIwMTUtMDgtMDMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIFVwZGF0ZSBPcHRpb25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjkuNSByZWxlYXNlLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVEYXRhLmNwcAppbmRleCAxYmY4OWY1ZDBiMGE2NWEwNWM1OGVkMzE2YTMyMzkxYTQxNzYx ZWQ5Li5kOWE0NzhiYjgwMzhhMmEzNDQzZDJjYzFjN2I1ZTJmMGY1MDBjZmE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVE YXRhLmNwcApAQCAtODYsOCArODYsMTAgQEAgRGF0YSBtYXBGaWxlKGNvbnN0IGNoYXIqIHBhdGgp CiAKIERhdGEgYWRvcHRBbmRNYXBGaWxlKGludCBmZCwgc2l6ZV90IG9mZnNldCwgc2l6ZV90IHNp emUpCiB7Ci0gICAgaWYgKCFzaXplKQorICAgIGlmICghc2l6ZSkgeworICAgICAgICBjbG9zZShm ZCk7CiAgICAgICAgIHJldHVybiBEYXRhOjplbXB0eSgpOworICAgIH0KIAogICAgIHZvaWQqIG1h cCA9IG1tYXAobnVsbHB0ciwgc2l6ZSwgUFJPVF9SRUFELCBNQVBfUFJJVkFURSwgZmQsIG9mZnNl dCk7CiAgICAgaWYgKG1hcCA9PSBNQVBfRkFJTEVEKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmNw cAppbmRleCBjODA4YjJlOTZiOGMxY2U4NDY5YTdlNmMwODQ4ZjkzMGFhZTMwMWZhLi41ZDYxOTNi NWY2MzE3Y2JiZGJlNjdhOGY2MTI3NzcyZWFlNzAxYmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9y ZS5jcHAKQEAgLTI1MywxNSArMjUzLDIxIEBAIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgY29tcGls ZWRUb0ZpbGUoU3RyaW5nJiYganNvbiwgY29uc3QgU3RyaW5nJiBmaW5hbEZpbGVQYXRoCiAgICAg Y2hhciBpbnZhbGlkSGVhZGVyW0NvbnRlbnRFeHRlbnNpb25GaWxlSGVhZGVyU2l6ZV07CiAgICAg bWVtc2V0KGludmFsaWRIZWFkZXIsIDB4RkYsIHNpemVvZihpbnZhbGlkSGVhZGVyKSk7CiAgICAg Ly8gVGhpcyBoZWFkZXIgd2lsbCBiZSByZXdyaXR0ZW4gaW4gQ29tcGlsYXRpb25DbGllbnQ6OmZp bmFsaXplLgotICAgIGlmIChXZWJDb3JlOjp3cml0ZVRvRmlsZSh0ZW1wb3JhcnlGaWxlSGFuZGxl LCBpbnZhbGlkSGVhZGVyLCBzaXplb2YoaW52YWxpZEhlYWRlcikpID09IC0xKQorICAgIGlmIChX ZWJDb3JlOjp3cml0ZVRvRmlsZSh0ZW1wb3JhcnlGaWxlSGFuZGxlLCBpbnZhbGlkSGVhZGVyLCBz aXplb2YoaW52YWxpZEhlYWRlcikpID09IC0xKSB7CisgICAgICAgIFdlYkNvcmU6OmNsb3NlRmls ZSh0ZW1wb3JhcnlGaWxlSGFuZGxlKTsKICAgICAgICAgcmV0dXJuIFVzZXJDb250ZW50RXh0ZW5z aW9uU3RvcmU6OkVycm9yOjpDb21waWxlRmFpbGVkOworICAgIH0KIAogICAgIENvbXBpbGF0aW9u Q2xpZW50IGNvbXBpbGF0aW9uQ2xpZW50KHRlbXBvcmFyeUZpbGVIYW5kbGUsIG1ldGFEYXRhKTsK ICAgICAKLSAgICBpZiAoYXV0byBjb21waWxlckVycm9yID0gY29tcGlsZVJ1bGVMaXN0KGNvbXBp bGF0aW9uQ2xpZW50LCBXVEY6Om1vdmUoanNvbikpKQorICAgIGlmIChhdXRvIGNvbXBpbGVyRXJy b3IgPSBjb21waWxlUnVsZUxpc3QoY29tcGlsYXRpb25DbGllbnQsIFdURjo6bW92ZShqc29uKSkp IHsKKyAgICAgICAgV2ViQ29yZTo6Y2xvc2VGaWxlKHRlbXBvcmFyeUZpbGVIYW5kbGUpOwogICAg ICAgICByZXR1cm4gY29tcGlsZXJFcnJvcjsKLSAgICBpZiAoY29tcGlsYXRpb25DbGllbnQuaGFk RXJyb3JXaGlsZVdyaXRpbmdUb0ZpbGUoKSkKKyAgICB9CisgICAgaWYgKGNvbXBpbGF0aW9uQ2xp ZW50LmhhZEVycm9yV2hpbGVXcml0aW5nVG9GaWxlKCkpIHsKKyAgICAgICAgV2ViQ29yZTo6Y2xv c2VGaWxlKHRlbXBvcmFyeUZpbGVIYW5kbGUpOwogICAgICAgICByZXR1cm4gVXNlckNvbnRlbnRF eHRlbnNpb25TdG9yZTo6RXJyb3I6OkNvbXBpbGVGYWlsZWQ7CisgICAgfQogICAgIAogICAgIG1h cHBlZERhdGEgPSBhZG9wdEFuZE1hcEZpbGUodGVtcG9yYXJ5RmlsZUhhbmRsZSwgMCwgbWV0YURh dGEuZmlsZVNpemUoKSk7CiAgICAgaWYgKG1hcHBlZERhdGEuaXNOdWxsKCkpCg==