author | Ehsan Akhgari <ehsan@mozilla.com> |
Thu, 21 Mar 2013 14:46:21 -0400 | |
changeset 125872 | dce1cfbf2dcc6b4e6d021de9d5679ca961c3dbde |
parent 125871 | f9bc9047e04d9ad3d1e2aef2f69408a43844753b |
child 125873 | 89fa6284cb78b1a63d2512dea4bd02b7543f7ef2 |
push id | 24464 |
push user | emorley@mozilla.com |
push date | Fri, 22 Mar 2013 14:00:12 +0000 |
treeherder | mozilla-central@3825fdbcec62 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bent |
bugs | 853562 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -3931,24 +3931,21 @@ GetAllHelper::DoDatabaseWork(mozIStorage rv = mKeyRange->Upper().BindToStatement(stmt, upperKeyName); NS_ENSURE_SUCCESS(rv, rv); } } bool hasResult; while (NS_SUCCEEDED((rv = stmt->ExecuteStep(&hasResult))) && hasResult) { if (mCloneReadInfos.Capacity() == mCloneReadInfos.Length()) { - if (!mCloneReadInfos.SetCapacity(mCloneReadInfos.Capacity() * 2)) { - NS_ERROR("Out of memory!"); - return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; - } + mCloneReadInfos.SetCapacity(mCloneReadInfos.Capacity() * 2); } StructuredCloneReadInfo* readInfo = mCloneReadInfos.AppendElement(); - NS_ASSERTION(readInfo, "Shouldn't fail if SetCapacity succeeded!"); + NS_ASSERTION(readInfo, "Shouldn't fail since SetCapacity succeeded!"); rv = IDBObjectStore::GetStructuredCloneReadInfoFromStatement(stmt, 0, 1, mDatabase, *readInfo); NS_ENSURE_SUCCESS(rv, rv); } NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); return NS_OK;