110103 2013-02-18 04:37:28 -0800 [Soup] Free cookies explicitly in loops instead of using GOwnPtr 2013-02-18 11:03:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez cgarcia danw gustavo laszlo.gombos mrobinson rakuco webkit.review.bot oldest_to_newest 835342 0 cdumez 2013-02-18 04:37:28 -0800 We sometimes use GOwnPtr to free the cookies, and sometimes free them manually using soup_cookie_free(). We should make this more consistent and use GOwnPtr as much as possible and this is the preferred pattern. 835349 1 188851 cdumez 2013-02-18 04:44:03 -0800 Created attachment 188851 Patch 835368 2 cgarcia 2013-02-18 05:14:30 -0800 I agree with this change, but note that Martin was opposed to it, see the discussion in bug https://bugs.webkit.org/show_bug.cgi?id=82082. 835373 3 cdumez 2013-02-18 05:18:22 -0800 (In reply to comment #2) > I agree with this change, but note that Martin was opposed to it, see the discussion in bug https://bugs.webkit.org/show_bug.cgi?id=82082. Ok, clearing commit flag for now then. I assumed this was fine because GOwnPtr is already used this way in getRawCookies() and deleteCookie(). We should be consistent (either way). We have 2 functions uses GOwnPtr and 2 using soup_cookie_free(). I'll wait for Martin to comment on this. 835555 4 188851 cdumez 2013-02-18 09:27:53 -0800 Comment on attachment 188851 Patch Based on IRC discussion with Martin Robinson, I'll upload a patch harmonizing the other way around (freeing explicitly). 835565 5 188908 cdumez 2013-02-18 09:35:02 -0800 Created attachment 188908 Patch 835629 6 188908 webkit.review.bot 2013-02-18 11:03:04 -0800 Comment on attachment 188908 Patch Clearing flags on attachment: 188908 Committed r143243: <http://trac.webkit.org/changeset/143243> 835630 7 webkit.review.bot 2013-02-18 11:03:09 -0800 All reviewed patches have been landed. Closing bug. 188851 2013-02-18 04:44:03 -0800 2013-02-18 09:35:02 -0800 Patch 110103_cookie_GOwnPtr.patch text/plain 2567 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZDAzODk2Li4xZWEwNjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTMtMDItMTggIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcu Y29tPgorCisgICAgICAgIFtTb3VwXSBBdm9pZCBtYW51YWwgbWVtb3J5IGhhbmRsaW5nIGluIFNv dXBDb29raWVKYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDEwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFVzZSBHT3duUHRyIGZvciBTb3VwIENvb2tpZXMgaW5zdGVhZCBvZiBmcmVlaW5nIHRoZW0g bWFudWFsbHkgYnkgY2FsbGluZworICAgICAgICBzb3VwX2Nvb2tpZV9mcmVlKCkuIFRoaXMgaXMg bW9yZSBjb25zaXN0ZW50IHdpdGggb3RoZXIgbWV0aG9kcyBpbiB0aGUKKyAgICAgICAgZmlsZSBh bmQgdGhpcyBpcyB0aGUgcHJlZmVycmVkIHBhdHRlcm4uCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAv Q29va2llSmFyU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkZWxldGVDb29raWVzRm9ySG9z dG5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlQWxsQ29va2llcyk6CisKIDIwMTMtMDIt MTggIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW1dLMl1bRUZMXSBVbmlmaWVkIHRleHQgY2hlY2tlciBpbXBsZW1lbnRhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNv dXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNv dXAuY3BwCmluZGV4IGFlNTRiYzAuLjkyMzAxZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAKQEAgLTE5NCwxMCAr MTk0LDkgQEAgdm9pZCBkZWxldGVDb29raWVzRm9ySG9zdG5hbWUoY29uc3QgTmV0d29ya1N0b3Jh Z2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBTdHJpbmcKICAgICBTb3VwQ29va2llSmFyKiBjb29r aWVKYXIgPSBjb29raWVKYXJGb3JTZXNzaW9uKHNlc3Npb24pOwogICAgIEdPd25QdHI8R1NMaXN0 PiBjb29raWVzKHNvdXBfY29va2llX2phcl9hbGxfY29va2llcyhjb29raWVKYXIpKTsKICAgICBm b3IgKEdTTGlzdCogaXRlbSA9IGNvb2tpZXMuZ2V0KCk7IGl0ZW07IGl0ZW0gPSBnX3NsaXN0X25l eHQoaXRlbSkpIHsKLSAgICAgICAgU291cENvb2tpZSogY29va2llID0gc3RhdGljX2Nhc3Q8U291 cENvb2tpZSo+KGl0ZW0tPmRhdGEpOwotICAgICAgICBpZiAoc291cF9jb29raWVfZG9tYWluX21h dGNoZXMoY29va2llLCBob3N0TmFtZVN0cmluZy5kYXRhKCkpKQotICAgICAgICAgICAgc291cF9j b29raWVfamFyX2RlbGV0ZV9jb29raWUoY29va2llSmFyLCBjb29raWUpOwotICAgICAgICBzb3Vw X2Nvb2tpZV9mcmVlKGNvb2tpZSk7CisgICAgICAgIEdPd25QdHI8U291cENvb2tpZT4gY29va2ll KHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5kYXRhKSk7CisgICAgICAgIGlmIChzb3Vw X2Nvb2tpZV9kb21haW5fbWF0Y2hlcyhjb29raWUuZ2V0KCksIGhvc3ROYW1lU3RyaW5nLmRhdGEo KSkpCisgICAgICAgICAgICBzb3VwX2Nvb2tpZV9qYXJfZGVsZXRlX2Nvb2tpZShjb29raWVKYXIs IGNvb2tpZS5nZXQoKSk7CiAgICAgfQogfQogCkBAIC0yMDYsOSArMjA1LDggQEAgdm9pZCBkZWxl dGVBbGxDb29raWVzKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbikKICAgICBT b3VwQ29va2llSmFyKiBjb29raWVKYXIgPSBjb29raWVKYXJGb3JTZXNzaW9uKHNlc3Npb24pOwog ICAgIEdPd25QdHI8R1NMaXN0PiBjb29raWVzKHNvdXBfY29va2llX2phcl9hbGxfY29va2llcyhj b29raWVKYXIpKTsKICAgICBmb3IgKEdTTGlzdCogaXRlbSA9IGNvb2tpZXMuZ2V0KCk7IGl0ZW07 IGl0ZW0gPSBnX3NsaXN0X25leHQoaXRlbSkpIHsKLSAgICAgICAgU291cENvb2tpZSogY29va2ll ID0gc3RhdGljX2Nhc3Q8U291cENvb2tpZSo+KGl0ZW0tPmRhdGEpOwotICAgICAgICBzb3VwX2Nv b2tpZV9qYXJfZGVsZXRlX2Nvb2tpZShjb29raWVKYXIsIGNvb2tpZSk7Ci0gICAgICAgIHNvdXBf Y29va2llX2ZyZWUoY29va2llKTsKKyAgICAgICAgR093blB0cjxTb3VwQ29va2llPiBjb29raWUo c3RhdGljX2Nhc3Q8U291cENvb2tpZSo+KGl0ZW0tPmRhdGEpKTsKKyAgICAgICAgc291cF9jb29r aWVfamFyX2RlbGV0ZV9jb29raWUoY29va2llSmFyLCBjb29raWUuZ2V0KCkpOwogICAgIH0KIH0K IAo= 188908 2013-02-18 09:35:02 -0800 2013-02-18 11:03:04 -0800 Patch 110103_free_cookies_manually.patch text/plain 3573 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YzkyNjdkLi42OGU2MDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDItMTggIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcu Y29tPgorCisgICAgICAgIFtTb3VwXSBGcmVlIGNvb2tpZXMgZXhwbGljaXRseSBpbiBsb29wcyBp bnN0ZWFkIG9mIHVzaW5nIEdPd25QdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMDEwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZyZWUgY29va2llcyBleHBsaWNpdGx5IGluIGxvb3BzIGluc3RlYWQg b2YgdXNpbmcgR093blB0ciBmb3IgdGhpcy4KKyAgICAgICAgVW50aWwgbm93LCB0aGUgY29kZSB3 YXMgbWl4aW5nIGJvdGggc3R5bGVzLiBUaGlzIHBhdGNoIG1ha2VzIHRoZQorICAgICAgICBjb2Rl IGNvbnNpc3RlbnQgb25lIHdheS4gQWRvcHRpbmcgbGlzdCBpdGVtcyB3aXRoIEdPd25QdHIgZm9y IHRoZQorICAgICAgICBzb2xlIHB1cnBvc2UgdG8gZnJlZSB0aGVtIG1ha2VzIHRoZSBmcmVlaW5n IGxlc3Mgb2J2aW91cyBhbmQgbWF5CisgICAgICAgIGxlYWQgdG8gbWlzdGFrZXMgaWYgc29tZW9u ZSByZWZhY3RvcnMgdGhlIGNvZGUgYW5kIGNhbGxzICJicmVhazsiCisgICAgICAgIHRvIGFib3J0 IGxvb3AgaXRlcmF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hh bmdlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Z2V0UmF3Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpk ZWxldGVDb29raWUpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0SG9zdG5hbWVzV2l0aENvb2tpZXMp OgorCiAyMDEzLTAyLTE4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBGb3JjZSBzaW5nbGUgaGVhZGVyIGluY2x1ZGVzIGluIEdPYmpl Y3QgRE9NIGJpbmRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAKaW5kZXggYmQyNzNjMC4uOWIzOTlhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJT b3VwLmNwcApAQCAtMTQ4LDEwICsxNDgsMTEgQEAgYm9vbCBnZXRSYXdDb29raWVzKGNvbnN0IE5l dHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgS1VSTCYgLypmaXJzdFBhcnQKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgZm9yIChHU0xpc3QqIGl0ZXIgPSBjb29raWVzLmdl dCgpOyBpdGVyOyBpdGVyID0gZ19zbGlzdF9uZXh0KGl0ZXIpKSB7Ci0gICAgICAgIEdPd25QdHI8 U291cENvb2tpZT4gY29va2llKHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVyLT5kYXRhKSk7 CisgICAgICAgIFNvdXBDb29raWUqIGNvb2tpZSA9IHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihp dGVyLT5kYXRhKTsKICAgICAgICAgcmF3Q29va2llcy5hcHBlbmQoQ29va2llKFN0cmluZzo6ZnJv bVVURjgoY29va2llLT5uYW1lKSwgU3RyaW5nOjpmcm9tVVRGOChjb29raWUtPnZhbHVlKSwgU3Ry aW5nOjpmcm9tVVRGOChjb29raWUtPmRvbWFpbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBTdHJpbmc6OmZyb21VVEY4KGNvb2tpZS0+cGF0aCksIHN0YXRpY19jYXN0PGRvdWJs ZT4oc291cF9kYXRlX3RvX3RpbWVfdChjb29raWUtPmV4cGlyZXMpKSAqIDEwMDAsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb29raWUtPmh0dHBfb25seSwgY29va2llLT5zZWN1 cmUsIHNvdXBfY29va2llX2phcl9pc19wZXJzaXN0ZW50KGphcikpKTsKKyAgICAgICAgc291cF9j b29raWVfZnJlZShjb29raWUpOwogICAgIH0KIAogICAgIHJldHVybiB0cnVlOwpAQCAtMTcxLDEx ICsxNzIsMTIgQEAgdm9pZCBkZWxldGVDb29raWUoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9u JiBzZXNzaW9uLCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFMKICAgICBDU3RyaW5nIGNvb2tpZU5h bWUgPSBuYW1lLnV0ZjgoKTsKICAgICBib29sIHdhc0RlbGV0ZWQgPSBmYWxzZTsKICAgICBmb3Ig KEdTTGlzdCogaXRlciA9IGNvb2tpZXMuZ2V0KCk7IGl0ZXI7IGl0ZXIgPSBnX3NsaXN0X25leHQo aXRlcikpIHsKLSAgICAgICAgR093blB0cjxTb3VwQ29va2llPiBjb29raWUoc3RhdGljX2Nhc3Q8 U291cENvb2tpZSo+KGl0ZXItPmRhdGEpKTsKKyAgICAgICAgU291cENvb2tpZSogY29va2llID0g c3RhdGljX2Nhc3Q8U291cENvb2tpZSo+KGl0ZXItPmRhdGEpOwogICAgICAgICBpZiAoIXdhc0Rl bGV0ZWQgJiYgY29va2llTmFtZSA9PSBjb29raWUtPm5hbWUpIHsKLSAgICAgICAgICAgIHNvdXBf Y29va2llX2phcl9kZWxldGVfY29va2llKGphciwgY29va2llLmdldCgpKTsKKyAgICAgICAgICAg IHNvdXBfY29va2llX2phcl9kZWxldGVfY29va2llKGphciwgY29va2llKTsKICAgICAgICAgICAg IHdhc0RlbGV0ZWQgPSB0cnVlOwogICAgICAgICB9CisgICAgICAgIHNvdXBfY29va2llX2ZyZWUo Y29va2llKTsKICAgICB9CiB9CiAKQEAgLTE4NCwxMCArMTg2LDEwIEBAIHZvaWQgZ2V0SG9zdG5h bWVzV2l0aENvb2tpZXMoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBIYXNo U2V0PFN0cmluCiAgICAgU291cENvb2tpZUphciogY29va2llSmFyID0gY29va2llSmFyRm9yU2Vz c2lvbihzZXNzaW9uKTsKICAgICBHT3duUHRyPEdTTGlzdD4gY29va2llcyhzb3VwX2Nvb2tpZV9q YXJfYWxsX2Nvb2tpZXMoY29va2llSmFyKSk7CiAgICAgZm9yIChHU0xpc3QqIGl0ZW0gPSBjb29r aWVzLmdldCgpOyBpdGVtOyBpdGVtID0gZ19zbGlzdF9uZXh0KGl0ZW0pKSB7Ci0gICAgICAgIEdP d25QdHI8U291cENvb2tpZT4gY29va2llKHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5k YXRhKSk7Ci0gICAgICAgIGlmICghY29va2llLT5kb21haW4pCi0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgaG9zdG5hbWVzLmFkZChTdHJpbmc6OmZyb21VVEY4KGNvb2tpZS0+ZG9tYWlu KSk7CisgICAgICAgIFNvdXBDb29raWUqIGNvb2tpZSA9IHN0YXRpY19jYXN0PFNvdXBDb29raWUq PihpdGVtLT5kYXRhKTsKKyAgICAgICAgaWYgKGNvb2tpZS0+ZG9tYWluKQorICAgICAgICAgICAg aG9zdG5hbWVzLmFkZChTdHJpbmc6OmZyb21VVEY4KGNvb2tpZS0+ZG9tYWluKSk7CisgICAgICAg IHNvdXBfY29va2llX2ZyZWUoY29va2llKTsKICAgICB9CiB9CiAK