From bf01efe92a2d8744e11e05d97929adae283dedbe Mon Sep 17 00:00:00 2001 From: "dwitte%stanford.edu" Date: Sun, 26 Oct 2003 01:17:13 +0000 Subject: [PATCH] er, for real this time... git-svn-id: svn://10.0.0.236/trunk@148383 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/cookie/src/nsCookieService.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mozilla/netwerk/cookie/src/nsCookieService.cpp b/mozilla/netwerk/cookie/src/nsCookieService.cpp index c17c04e4b44..c6bbc6d87f5 100644 --- a/mozilla/netwerk/cookie/src/nsCookieService.cpp +++ b/mozilla/netwerk/cookie/src/nsCookieService.cpp @@ -627,8 +627,10 @@ nsCookieService::GetCookieStringFromHttp(nsIURI *aHostURI, } currentDot = nextDot; - nextDot = strchr(currentDot + 1, '.'); - } + if (currentDot) + nextDot = strchr(currentDot + 1, '.'); + + } while (currentDot); // return cookies in order of path length; longest to shortest. // this is required per RFC2109. @@ -2131,7 +2133,7 @@ nsCookieService::CountCookiesFromHost(nsCookie *aCookie, const char *currentDot = hostWithDot.get(); const char *nextDot = currentDot + 1; - while (nextDot) { + do { nsCookieEntry *entry = mHostTable.GetEntry(currentDot); for (nsListIter iter(entry); iter.current; ++iter) { // only count session or non-expired cookies @@ -2147,8 +2149,10 @@ nsCookieService::CountCookiesFromHost(nsCookie *aCookie, } currentDot = nextDot; - nextDot = strchr(currentDot + 1, '.'); - } + if (currentDot) + nextDot = strchr(currentDot + 1, '.'); + + } while (currentDot); return countFromHost; }