From 8c40f0496313b6d549f08492c439980aa4d6b291 Mon Sep 17 00:00:00 2001 From: Mathew Zaleski Date: Tue, 2 Feb 2016 21:16:08 -0500 Subject: [PATCH 1/3] Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000000..49174c3e413bf --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +testing 1234 From 12a26d30fbecb68ff3fa51aadd2d47558e08448c Mon Sep 17 00:00:00 2001 From: Mathew Zaleski Date: Tue, 2 Feb 2016 21:30:59 -0500 Subject: [PATCH 2/3] Delete README.md --- README.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 49174c3e413bf..0000000000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -testing 1234 From 95f07bce26178b8e110c3c70f277f9a58af93042 Mon Sep 17 00:00:00 2001 From: Steven Low Date: Thu, 3 Mar 2016 17:59:27 -0600 Subject: [PATCH 3/3] Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCookieService::PurgeCookies to allocate nsTArray instead of AutoTArray. r=Josh Matthews --- 1247548.patch | 31 ++++++++++++++++++++++++++++++ netwerk/cookie/nsCookieService.cpp | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 1247548.patch diff --git a/1247548.patch b/1247548.patch new file mode 100644 index 0000000000000..49afd070e7e6a --- /dev/null +++ b/1247548.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Steven Low + +Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCookieService::PurgeCookeis to allocate nsTArray instead of AutoTArray. r=Josh Matthews + + +diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp +index 3060ec6..1bbc1db 100644 +--- a/netwerk/cookie/nsCookieService.cpp ++++ b/netwerk/cookie/nsCookieService.cpp +@@ -2697,7 +2697,7 @@ nsCookieService::EnsureReadComplete() + + nsCString baseDomain, name, value, host, path; + bool hasResult; +- AutoTArray array; ++ nsTArray array(kMaxNumberOfCookies); + while (1) { + rv = stmt->ExecuteStep(&hasResult); + if (NS_FAILED(rv)) { +@@ -4087,8 +4087,8 @@ nsCookieService::PurgeCookies(int64_t aCurrentTimeInUsec) + ("PurgeCookies(): beginning purge with %ld cookies and %lld oldest age", + mDBState->cookieCount, aCurrentTimeInUsec - mDBState->cookieOldestTime)); + +- typedef AutoTArray PurgeList; +- PurgeList purgeList; ++ typedef nsTArray PurgeList; ++ PurgeList purgeList(kMaxNumberOfCookies); + + nsCOMPtr removedList = do_CreateInstance(NS_ARRAY_CONTRACTID); + + diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp index 2f5c0b7160fa8..608e3fe0ce451 100644 --- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -2663,7 +2663,7 @@ nsCookieService::EnsureReadComplete() nsCString baseDomain, name, value, host, path; bool hasResult; - nsAutoTArray array; + nsTArray array(kMaxNumberOfCookies); while (1) { rv = stmt->ExecuteStep(&hasResult); if (NS_FAILED(rv)) { @@ -4051,8 +4051,8 @@ nsCookieService::PurgeCookies(int64_t aCurrentTimeInUsec) ("PurgeCookies(): beginning purge with %ld cookies and %lld oldest age", mDBState->cookieCount, aCurrentTimeInUsec - mDBState->cookieOldestTime)); - typedef nsAutoTArray PurgeList; - PurgeList purgeList; + typedef nsTArray PurgeList; + PurgeList purgeList(kMaxNumberOfCookies); nsCOMPtr removedList = do_CreateInstance(NS_ARRAY_CONTRACTID);