54905 2011-02-21 13:44:46 -0800 Remove global initializer in CookieStorageCFNet.cpp 2011-02-21 16:15:26 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 51836 1 psolanki webkit-unassigned abarth darin psolanki oldest_to_newest 354787 0 psolanki 2011-02-21 13:44:46 -0800 When compiling CookieStorageCFNet.cpp on Mac, I get PhaseScriptExecution "Check For Global Initializers" ERROR: CookieStorageCFNet.o has one or more global initializers in it! (/Volumes/Data/psolanki/sources/external/WebKit.git/WebKitBuild/cfnetwork-mac/WebCore.build/Debug/WebCore.build/Objects-normal/x86_64/CookieStorageCFNet.o), near WebCore::currentCookieStorage() __ZN7WebCore20currentCookieStorageEv.eh 354788 1 83212 psolanki 2011-02-21 13:48:28 -0800 Created attachment 83212 Patch First stab at fixing this error. Is there a better way to do this? 354798 2 83212 abarth 2011-02-21 14:11:53 -0800 Comment on attachment 83212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83212&action=review > Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp:43 > -static RetainPtr<CFHTTPCookieStorageRef> s_cookieStorage; > +static CFHTTPCookieStorageRef s_cookieStorage; Do we need to init s_cookieStorage to 0 ? > Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp:70 > + s_cookieStorage = wkCreatePrivateHTTPCookieStorage(); Should we assert that s_cookieStorage is 0 here? 354800 3 83212 psolanki 2011-02-21 14:16:43 -0800 Comment on attachment 83212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83212&action=review >> Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp:43 >> +static CFHTTPCookieStorageRef s_cookieStorage; > > Do we need to init s_cookieStorage to 0 ? Statics are initialized to 0 so we should be fine here. >> Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp:70 >> + s_cookieStorage = wkCreatePrivateHTTPCookieStorage(); > > Should we assert that s_cookieStorage is 0 here? Good catch. adoptCF() calls CFRelease on its m_ptr so my patch would cause a leak. I think a conditional release before the if block should fix that. 354823 4 83219 psolanki 2011-02-21 14:54:56 -0800 Created attachment 83219 Patch 354831 5 83219 darin 2011-02-21 15:03:19 -0800 Comment on attachment 83219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83219&action=review > Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp:61 > + if (s_cookieStorage) > + CFRelease(s_cookieStorage); > + > + CFRetain(cookieStorage); The usual pattern is to put retain before release so things work properly if s_cookieStorage and cookieStorage happen to be the same object. You could do that here by just moving the CFRetain call up a couple lines. 354888 6 psolanki 2011-02-21 16:15:13 -0800 Commited r79261 - <http://trac.webkit.org/changeset/79261> 83212 2011-02-21 13:48:28 -0800 2011-02-21 14:54:52 -0800 Patch bug-54905-20110221134826.patch text/plain 2227 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogNzkyMzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiYmMxNDU2ZDc4ZDIxN2Uw ZGU0ZTNhODQ0NzNhYjcwZGMxNDIwMTc5Li5mYjllYmVlNzFiODBjZGYwZGY5YjEyMmM0NjE3MWQ3 NWQzM2Y2MDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTEtMDItMjEgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBnbG9iYWwgaW5pdGlhbGl6ZXIgaW4gQ29v a2llU3RvcmFnZUNGTmV0LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTQ5MDUKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvQ29va2ll U3RvcmFnZUNGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmN1cnJlbnRDb29raWVTdG9yYWdl KToKKyAgICAgICAgKFdlYkNvcmU6OnNldEN1cnJlbnRDb29raWVTdG9yYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OnNldENvb2tpZVN0b3JhZ2VQcml2YXRlQnJvd3NpbmdFbmFibGVkKToKKworMjAx MS0wMi0yMSAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBhcHBsZS5jb20+CisKICAgICAgICAg V2ViQ29yZSBzaG91bGQgdXNlIENGTmV0d29yay1iYXNlZCBsb2FkZXIgb24gTWFjCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTgzNgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZVN0b3JhZ2VDRk5l dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZVN0b3JhZ2VD Rk5ldC5jcHAKaW5kZXggOWY3MWU0M2FjNzZiOTc0ODcwYTcyMjhhZTFiNGU1Zjc0NjY0NTNjMC4u ZTVmNmI1MTBkMDYzOGRhMDNkZWEwNjI2NzVmMjQxZWEyZWFlMTBlNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Db29raWVTdG9yYWdlQ0ZOZXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29va2llU3RvcmFnZUNGTmV0 LmNwcApAQCAtNDAsMTQgKzQwLDE0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGlj IFJldGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdlUmVmPiBzX2Nvb2tpZVN0b3JhZ2U7CitzdGF0 aWMgQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiBzX2Nvb2tpZVN0b3JhZ2U7CiAKIENGSFRUUENvb2tp ZVN0b3JhZ2VSZWYgY3VycmVudENvb2tpZVN0b3JhZ2UoKQogewogICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7CiAKICAgICBpZiAoc19jb29raWVTdG9yYWdlKQotICAgICAgICByZXR1cm4gc19j b29raWVTdG9yYWdlLmdldCgpOworICAgICAgICByZXR1cm4gc19jb29raWVTdG9yYWdlOwogICAg IHJldHVybiB3a0dldERlZmF1bHRIVFRQQ29va2llU3RvcmFnZSgpOwogfQogCkBAIC01NSw2ICs1 NSwxMCBAQCB2b2lkIHNldEN1cnJlbnRDb29raWVTdG9yYWdlKENGSFRUUENvb2tpZVN0b3JhZ2VS ZWYgY29va2llU3RvcmFnZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCisgICAg aWYgKHNfY29va2llU3RvcmFnZSkKKyAgICAgICAgQ0ZSZWxlYXNlKHNfY29va2llU3RvcmFnZSk7 CisKKyAgICBDRlJldGFpbihjb29raWVTdG9yYWdlKTsKICAgICBzX2Nvb2tpZVN0b3JhZ2UgPSBj b29raWVTdG9yYWdlOwogfQogCkBAIC02Myw5ICs2NywxMSBAQCB2b2lkIHNldENvb2tpZVN0b3Jh Z2VQcml2YXRlQnJvd3NpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCkKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogCiAgICAgaWYgKGVuYWJsZWQpCi0gICAgICAgIHNfY29va2llU3RvcmFnZS5h ZG9wdENGKHdrQ3JlYXRlUHJpdmF0ZUhUVFBDb29raWVTdG9yYWdlKCkpOwotICAgIGVsc2UKKyAg ICAgICAgc19jb29raWVTdG9yYWdlID0gd2tDcmVhdGVQcml2YXRlSFRUUENvb2tpZVN0b3JhZ2Uo KTsKKyAgICBlbHNlIHsKKyAgICAgICAgQ0ZSZWxlYXNlKHNfY29va2llU3RvcmFnZSk7CiAgICAg ICAgIHNfY29va2llU3RvcmFnZSA9IDA7CisgICAgfQogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCg== 83219 2011-02-21 14:54:56 -0800 2011-02-21 15:03:19 -0800 Patch bug-54905-20110221145454.patch text/plain 2213 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogNzkyMzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiYmMxNDU2ZDc4ZDIxN2Uw ZGU0ZTNhODQ0NzNhYjcwZGMxNDIwMTc5Li5mYjllYmVlNzFiODBjZGYwZGY5YjEyMmM0NjE3MWQ3 NWQzM2Y2MDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTEtMDItMjEgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBnbG9iYWwgaW5pdGlhbGl6ZXIgaW4gQ29v a2llU3RvcmFnZUNGTmV0LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTQ5MDUKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvQ29va2ll U3RvcmFnZUNGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmN1cnJlbnRDb29raWVTdG9yYWdl KToKKyAgICAgICAgKFdlYkNvcmU6OnNldEN1cnJlbnRDb29raWVTdG9yYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OnNldENvb2tpZVN0b3JhZ2VQcml2YXRlQnJvd3NpbmdFbmFibGVkKToKKworMjAx MS0wMi0yMSAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBhcHBsZS5jb20+CisKICAgICAgICAg V2ViQ29yZSBzaG91bGQgdXNlIENGTmV0d29yay1iYXNlZCBsb2FkZXIgb24gTWFjCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTgzNgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZVN0b3JhZ2VDRk5l dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZVN0b3JhZ2VD Rk5ldC5jcHAKaW5kZXggOWY3MWU0M2FjNzZiOTc0ODcwYTcyMjhhZTFiNGU1Zjc0NjY0NTNjMC4u NGQ1ZTAyZmYxYzRkOGViZjdjNTJmYWUzZjkwMTc0NDY0N2EwZWZlNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Db29raWVTdG9yYWdlQ0ZOZXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29va2llU3RvcmFnZUNGTmV0 LmNwcApAQCAtNDAsMTQgKzQwLDE0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGlj IFJldGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdlUmVmPiBzX2Nvb2tpZVN0b3JhZ2U7CitzdGF0 aWMgQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiBzX2Nvb2tpZVN0b3JhZ2U7CiAKIENGSFRUUENvb2tp ZVN0b3JhZ2VSZWYgY3VycmVudENvb2tpZVN0b3JhZ2UoKQogewogICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7CiAKICAgICBpZiAoc19jb29raWVTdG9yYWdlKQotICAgICAgICByZXR1cm4gc19j b29raWVTdG9yYWdlLmdldCgpOworICAgICAgICByZXR1cm4gc19jb29raWVTdG9yYWdlOwogICAg IHJldHVybiB3a0dldERlZmF1bHRIVFRQQ29va2llU3RvcmFnZSgpOwogfQogCkBAIC01NSw2ICs1 NSwxMCBAQCB2b2lkIHNldEN1cnJlbnRDb29raWVTdG9yYWdlKENGSFRUUENvb2tpZVN0b3JhZ2VS ZWYgY29va2llU3RvcmFnZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCisgICAg aWYgKHNfY29va2llU3RvcmFnZSkKKyAgICAgICAgQ0ZSZWxlYXNlKHNfY29va2llU3RvcmFnZSk7 CisKKyAgICBDRlJldGFpbihjb29raWVTdG9yYWdlKTsKICAgICBzX2Nvb2tpZVN0b3JhZ2UgPSBj b29raWVTdG9yYWdlOwogfQogCkBAIC02Miw4ICs2NiwxMSBAQCB2b2lkIHNldENvb2tpZVN0b3Jh Z2VQcml2YXRlQnJvd3NpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKICAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOwogCisgICAgaWYgKHNfY29va2llU3RvcmFnZSkKKyAgICAgICAgQ0ZSZWxl YXNlKHNfY29va2llU3RvcmFnZSk7CisKICAgICBpZiAoZW5hYmxlZCkKLSAgICAgICAgc19jb29r aWVTdG9yYWdlLmFkb3B0Q0Yod2tDcmVhdGVQcml2YXRlSFRUUENvb2tpZVN0b3JhZ2UoKSk7Cisg ICAgICAgIHNfY29va2llU3RvcmFnZSA9IHdrQ3JlYXRlUHJpdmF0ZUhUVFBDb29raWVTdG9yYWdl KCk7CiAgICAgZWxzZQogICAgICAgICBzX2Nvb2tpZVN0b3JhZ2UgPSAwOwogfQo=