Skip to content

Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCookieService::PurgeCookies to allocate nsTArray instead of AutoTArray #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lowsteve wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCookieService::PurgeCookies to allocate nsTArray instead of AutoTArray #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c40f04
Create README.md
jmzaleski Feb 3, 2016
12a26d3
Delete README.md
jmzaleski Feb 3, 2016
95f07bc
Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCooki…
Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions 1247548.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# HG changeset patch
# User Steven Low <steven.low@mail.utoronto.ca>

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<CookieDomainTuple, kMaxNumberOfCookies> array;
+ nsTArray<CookieDomainTuple> 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<nsListIter, kMaxNumberOfCookies> PurgeList;
- PurgeList purgeList;
+ typedef nsTArray<nsListIter> PurgeList;
+ PurgeList purgeList(kMaxNumberOfCookies);

nsCOMPtr<nsIMutableArray> removedList = do_CreateInstance(NS_ARRAY_CONTRACTID);


6 changes: 3 additions & 3 deletions netwerk/cookie/nsCookieService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,7 +2663,7 @@ nsCookieService::EnsureReadComplete()

nsCString baseDomain, name, value, host, path;
bool hasResult;
nsAutoTArray<CookieDomainTuple, kMaxNumberOfCookies> array;
nsTArray<CookieDomainTuple> array(kMaxNumberOfCookies);
while (1) {
rv = stmt->ExecuteStep(&hasResult);
if (NS_FAILED(rv)) {
Expand Down Expand Up @@ -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<nsListIter, kMaxNumberOfCookies> PurgeList;
PurgeList purgeList;
typedef nsTArray<nsListIter> PurgeList;
PurgeList purgeList(kMaxNumberOfCookies);

nsCOMPtr<nsIMutableArray> removedList = do_CreateInstance(NS_ARRAY_CONTRACTID);

Expand Down