From 3c409f7336146fe21514a5c00a2d4f42ef8dfda2 Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Thu, 20 Mar 2003 05:16:22 +0000 Subject: [PATCH] fixes bug 198270 "Trunk crash [@ COOKIE_Write] (nsCookies.cpp line 1734)" patch=dwitte@stanford.edu r=mvl@exedo.nl sr=darin git-svn-id: svn://10.0.0.236/trunk@139822 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/cookie/nsCookies.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mozilla/extensions/cookie/nsCookies.cpp b/mozilla/extensions/cookie/nsCookies.cpp index e29c05605ec..28095873d4d 100644 --- a/mozilla/extensions/cookie/nsCookies.cpp +++ b/mozilla/extensions/cookie/nsCookies.cpp @@ -1721,8 +1721,11 @@ COOKIE_Write() { dirSpec->AppendNative(NS_LITERAL_CSTRING(kCookiesFileName)); nsCOMPtr strm; - NS_NewLocalFileOutputStream(getter_AddRefs(strm), - dirSpec); + rv = NS_NewLocalFileOutputStream(getter_AddRefs(strm), + dirSpec); + if (NS_FAILED(rv)) { + return rv; + } #define COOKIEFILE_LINE1 "# HTTP Cookie File\n" #define COOKIEFILE_LINE2 "# http://www.netscape.com/newsref/std/cookie_spec.html\n" @@ -1803,24 +1806,25 @@ COOKIE_Read() { nsCAutoString buffer; PRBool added_to_list; + PRBool exists = PR_FALSE; nsCOMPtr dirSpec; nsresult rv = CKutil_ProfileDirectory(getter_AddRefs(dirSpec)); if (NS_FAILED(rv)) { return rv; } - dirSpec->AppendNative(NS_LITERAL_CSTRING(kCookiesFileName)); - - nsCOMPtr strm; - NS_NewLocalFileInputStream(getter_AddRefs(strm), - dirSpec); - - PRBool exists = PR_FALSE;; if (NS_FAILED(dirSpec->Exists(&exists)) || !exists) { /* file doesn't exist -- that's not an error */ return NS_OK; } + nsCOMPtr strm; + rv = NS_NewLocalFileInputStream(getter_AddRefs(strm), + dirSpec); + if (NS_FAILED(rv)) { + return rv; + } + /* format is: * * host \t isDomain \t path \t secure \t expires \t name \t cookie