46929 2010-09-30 12:42:35 -0700 [WINCE] Fix InternetGetCookie in CookieJarWin.cpp 2010-09-30 15:20:25 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga aroben commit-queue oldest_to_newest 287743 0 paroga 2010-09-30 12:42:35 -0700 see patch 287746 1 69365 paroga 2010-09-30 12:46:59 -0700 Created attachment 69365 Patch 287748 2 69365 aroben 2010-09-30 12:50:53 -0700 Comment on attachment 69365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69365&action=review > WebCore/platform/network/win/CookieJarWin.cpp:54 > - DWORD count = str.length() + 1; > + DWORD count = 0; > InternetGetCookie(str.charactersWithNullTermination(), 0, 0, &count); > if (count <= 1) // Null terminator counts as 1. > return String(); Why not check the return value of InternetGetCookie, too? 287749 3 paroga 2010-09-30 12:52:21 -0700 (In reply to comment #2) > Why not check the return value of InternetGetCookie, too? IMHO it's not required, but I can add it. 287751 4 aroben 2010-09-30 12:53:32 -0700 (In reply to comment #3) > (In reply to comment #2) > > Why not check the return value of InternetGetCookie, too? > IMHO it's not required, but I can add it. It seems like a good idea, rather than relying on how the out parameter is treated in failure cases (which MSDN doesn't document). 287755 5 69368 paroga 2010-09-30 12:59:55 -0700 Created attachment 69368 Patch 287877 6 69368 commit-queue 2010-09-30 15:19:27 -0700 Comment on attachment 69368 Patch Clearing flags on attachment: 69368 Committed r68841: <http://trac.webkit.org/changeset/68841> 287878 7 commit-queue 2010-09-30 15:19:32 -0700 All reviewed patches have been landed. Closing bug. 287880 8 69368 commit-queue 2010-09-30 15:20:25 -0700 Comment on attachment 69368 Patch Rejecting patch 69368 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'land-attachment', '--force-clean', '--ignore-builders', '--quiet', '--non-interactive', '--parent-command=commit-queue', 69368]" exit_code: 2 Last 500 characters of output: ipts/svn-apply', u'--reviewer', u'Adam Roben', u'--force']" exit_code: 1 Parsed 2 diffs from patch file(s). patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/network/win/CookieJarWin.cpp Hunk #1 FAILED at 48. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/platform/network/win/CookieJarWin.cpp.rej Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Adam Roben', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/4222021 69365 2010-09-30 12:46:59 -0700 2010-09-30 12:59:55 -0700 Patch bug-46929.patch text/plain 1245 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWYwYmFhYS4uMWY0MzQ3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0zMCAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbV0lOQ0VdIEZpeCBJbnRlcm5ldEdldENvb2tpZSBpbiBDb29r aWVKYXJXaW4uY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NjkyOQorCisgICAgICAgIElmIHRoZSBJbnRlcm5ldEdldENvb2tpZSBmYWlscyB0aGUg b3V0cHV0IHNpemUgd29uJ3QgYmUgc2V0LgorICAgICAgICBTZXQgdGhlIGRlZmF1bHQgc2l6ZSB0 byAwLCBzbyB3ZSBhbHdheXMgZ2V0IHRoZSBjb3JyZWN0IHNpemUuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29v a2llcyk6CisKIDIwMTAtMDktMjkgIEpvw6NvIFBhdWxvIFJlY2hpIFZpdGEgIDxqcHJ2aXRhQHBy b2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwCmluZGV4IDJiZGQ2YjMuLjdj MTE2ZjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vQ29va2llSmFy V2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Nvb2tpZUphcldpbi5j cHAKQEAgLTQ4LDcgKzQ4LDcgQEAgU3RyaW5nIGNvb2tpZXMoY29uc3QgRG9jdW1lbnQqIC8qZG9j dW1lbnQqLywgY29uc3QgS1VSTCYgdXJsKQogewogICAgIFN0cmluZyBzdHIgPSB1cmwuc3RyaW5n KCk7CiAKLSAgICBEV09SRCBjb3VudCA9IHN0ci5sZW5ndGgoKSArIDE7CisgICAgRFdPUkQgY291 bnQgPSAwOwogICAgIEludGVybmV0R2V0Q29va2llKHN0ci5jaGFyYWN0ZXJzV2l0aE51bGxUZXJt aW5hdGlvbigpLCAwLCAwLCAmY291bnQpOwogICAgIGlmIChjb3VudCA8PSAxKSAvLyBOdWxsIHRl cm1pbmF0b3IgY291bnRzIGFzIDEuCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsK 69368 2010-09-30 12:59:55 -0700 2010-09-30 15:20:25 -0700 Patch bug-46929b.patch text/plain 1755 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWYwYmFhYS4uY2I2ODNlNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOS0zMCAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbV0lOQ0VdIEZpeCBJbnRlcm5ldEdldENvb2tpZSBpbiBDb29r aWVKYXJXaW4uY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NjkyOQorCisgICAgICAgIElmIHRoZSBJbnRlcm5ldEdldENvb2tpZSBmYWlscyB0aGUg b3V0cHV0IHNpemUgd29uJ3QgYmUgc2V0LgorICAgICAgICBTZXQgdGhlIGRlZmF1bHQgc2l6ZSB0 byAwLCBzbyB3ZSBhbHdheXMgZ2V0IHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIGNoZWNr IHRoZSByZXR1cm4gdmFsdWUgb2YgSW50ZXJuZXRHZXRDb29raWUuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29v a2llcyk6CisKIDIwMTAtMDktMjkgIEpvw6NvIFBhdWxvIFJlY2hpIFZpdGEgIDxqcHJ2aXRhQHBy b2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Db29raWVKYXJXaW4uY3BwCmluZGV4IDJiZGQ2YjMuLmEy YWZiYzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vQ29va2llSmFy V2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Nvb2tpZUphcldpbi5j cHAKQEAgLTQ4LDEzICs0OCwxNyBAQCBTdHJpbmcgY29va2llcyhjb25zdCBEb2N1bWVudCogLypk b2N1bWVudCovLCBjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgU3RyaW5nIHN0ciA9IHVybC5zdHJp bmcoKTsKIAotICAgIERXT1JEIGNvdW50ID0gc3RyLmxlbmd0aCgpICsgMTsKLSAgICBJbnRlcm5l dEdldENvb2tpZShzdHIuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgMCwgMCwgJmNv dW50KTsKKyAgICBEV09SRCBjb3VudCA9IDA7CisgICAgaWYgKCFJbnRlcm5ldEdldENvb2tpZShz dHIuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgMCwgMCwgJmNvdW50KSkKKyAgICAg ICAgcmV0dXJuIFN0cmluZygpOworCiAgICAgaWYgKGNvdW50IDw9IDEpIC8vIE51bGwgdGVybWlu YXRvciBjb3VudHMgYXMgMS4KICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCiAgICAgVmVjdG9y PFVDaGFyPiBidWZmZXIoY291bnQpOwotICAgIEludGVybmV0R2V0Q29va2llKHN0ci5jaGFyYWN0 ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCAwLCBidWZmZXIuZGF0YSgpLCAmY291bnQpOworICAg IGlmICghSW50ZXJuZXRHZXRDb29raWUoc3RyLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9u KCksIDAsIGJ1ZmZlci5kYXRhKCksICZjb3VudCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsK KwogICAgIGJ1ZmZlci5zaHJpbmsoY291bnQgLSAxKTsgLy8gSWdub3JlIHRoZSBudWxsIHRlcm1p bmF0b3IuCiAgICAgcmV0dXJuIFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKIH0K