99445 2012-10-16 03:26:37 -0700 [Qt][WK2] REGRESSION(r131428): cookies.db created on wrong place 2012-10-26 01:24:42 -0700 1 1 1 Unclassified WebKit New Bugs 420+ All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 89666 1 ossy jbadics beidson hausmann jbadics laszlo.gombos ossy szledan webkit.review.bot oldest_to_newest 743028 0 ossy 2012-10-16 03:26:37 -0700 Everything created in the dir named /tmp/WebKitTestRunner-cQBEjz like this, but cookies.db is /tmp/WebKitTestRunner-cQBEjzcookies.db It seems a slash is missing somewhere . 750774 1 170638 jbadics 2012-10-25 07:00:27 -0700 Created attachment 170638 proposed patch There is a missing slash in CookieJarQt.cpp. I have added a slash there but I suppose that there would be some more elegant solutions because adding a slash directly doesn't look very professional. Consider this patch as a first step 751642 2 170638 hausmann 2012-10-26 00:36:06 -0700 Comment on attachment 170638 proposed patch Yeah, this patch comes from WK2's QtDefaultDataLocation.cpp, the QString defaultDataLocation() function in particular. Now we do things like this in various places: s_defaultDatabaseDirectory = defaultDataLocation() + QLatin1String("Databases"); or defaultDataLocation() + QLatin1String("WebpageIcons.db"); or (as you spotted) cookieStoragePath + QLatin1String("/cookies.db"); where cookieStoragePath comes from the same function (through several levels of indirection). I suggest to harden defaultDataLocation() instead and at the end of the function make sure that the path ends with a separator, i.e. if (!s_dataLocation.endsWith(QDir::separator()) s_dataLocation.append(QDir::separator()); 751647 3 hausmann 2012-10-26 00:38:22 -0700 Oh, but yeah this doesn't help in the WTR case when WTR sets properties like m_overrideLocalStorageDirectory 751650 4 170638 hausmann 2012-10-26 00:41:23 -0700 Comment on attachment 170638 proposed patch Ok, so since this patch can also come directly through the WK2 C API we have to protect this end. I don't think a double-slash hurts, so let's go for this :) 751662 5 jbadics 2012-10-26 01:02:39 -0700 (In reply to comment #4) > (From update of attachment 170638 [details]) > Ok, so since this patch can also come directly through the WK2 C API we have to protect this end. I don't think a double-slash hurts, so let's go for this :) Thank you for the comments, I'm looking into it. 751676 6 170638 webkit.review.bot 2012-10-26 01:24:38 -0700 Comment on attachment 170638 proposed patch Clearing flags on attachment: 170638 Committed r132583: <http://trac.webkit.org/changeset/132583> 751677 7 webkit.review.bot 2012-10-26 01:24:42 -0700 All reviewed patches have been landed. Closing bug. 170638 2012-10-25 07:00:27 -0700 2012-10-26 01:24:38 -0700 proposed patch cookiesdb_dumbpatch_0_changelog.patch text/plain 1405 jbadics ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MGI0MWZmLi42MWNiNGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMTAtMjUgIErDoW5vcyBCYWRpY3MgIDxqYmFkaWNzQGluZi51LXN6ZWdlZC5odT4K KworICAgICAgICBbUXRdUkVHUkVTU0lPTihyMTMxNDI4KTogY29va2llcy5kYiBjcmVhdGVkIG9u IHdyb25nIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTQ0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIGEgc2xhc2ggdG8gdGhlIHBhdGggb2YgY29va2llcy5kYiBpbiBDb29raWVKYXJR dC5jcHAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTaGFyZWRDb29raWVKYXJRdDo6U2hhcmVkQ29va2llSmFyUXQpOgorCiAyMDEy LTEwLTI1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1Y4XSBE T01EYXRhU3RvcmVIYW5kbGUgc2VydmVzIG5vIHB1cnBvc2UgYW5kIGNhbiBiZSByZW1vdmVkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHAKaW5kZXggN2Q1N2FhYy4u NjAyMTc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFy UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcApA QCAtMjM1LDcgKzIzNSw3IEBAIFNoYXJlZENvb2tpZUphclF0OjpTaGFyZWRDb29raWVKYXJRdChj b25zdCBTdHJpbmcmIGNvb2tpZVN0b3JhZ2VEaXJlY3RvcnkpCiB7CiAgICAgbV9kYXRhYmFzZSA9 IFFTcWxEYXRhYmFzZTo6YWRkRGF0YWJhc2UoUUxhdGluMVN0cmluZygiUVNRTElURSIpKTsKICAg ICBjb25zdCBRU3RyaW5nIGNvb2tpZVN0b3JhZ2VQYXRoID0gY29va2llU3RvcmFnZURpcmVjdG9y eTsKLSAgICBjb25zdCBRU3RyaW5nIGRhdGFCYXNlTmFtZSA9IGNvb2tpZVN0b3JhZ2VQYXRoICsg UUxhdGluMVN0cmluZygiY29va2llcy5kYiIpOworICAgIGNvbnN0IFFTdHJpbmcgZGF0YUJhc2VO YW1lID0gY29va2llU3RvcmFnZVBhdGggKyBRTGF0aW4xU3RyaW5nKCIvY29va2llcy5kYiIpOwog ICAgIG1fZGF0YWJhc2Uuc2V0RGF0YWJhc2VOYW1lKGRhdGFCYXNlTmFtZSk7CiAgICAgZW5zdXJl RGF0YWJhc2VUYWJsZSgpOwogICAgIGxvYWRDb29raWVzKCk7Cg==