Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CursorWindow_test: fix leaks" am: b3a175ac30

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240845

Change-Id: I6f96dbe4bc8494309087d9a15867bcd5f276d554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
George Burgess
2022-11-02 21:29:49 +00:00
committed by Automerger Merge Worker
parent 90b4735821 b3a175ac30
commit f8b09c78e6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/tests/CursorWindow_test.cpp
View File

@@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <memory>
#include <utility> #include <utility>
#include "androidfw/CursorWindow.h" #include "androidfw/CursorWindow.h"
@@ -184,7 +185,7 @@ TEST(CursorWindowTest, Inflate) {
ASSERT_EQ(w->allocRow(), OK); ASSERT_EQ(w->allocRow(), OK);
// Scratch buffer that will fit before inflation // Scratch buffer that will fit before inflation
void* buf = malloc(kHalfInlineSize); char buf[kHalfInlineSize];
// Store simple value // Store simple value
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK); ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
@@ -262,7 +263,7 @@ TEST(CursorWindowTest, ParcelSmall) {
ASSERT_EQ(w->allocRow(), OK); ASSERT_EQ(w->allocRow(), OK);
// Scratch buffer that will fit before inflation // Scratch buffer that will fit before inflation
void* buf = malloc(kHalfInlineSize); char buf[kHalfInlineSize];
// Store simple value // Store simple value
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK); ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
@@ -322,7 +323,8 @@ TEST(CursorWindowTest, ParcelLarge) {
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK); ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
// Store object that forces inflation // Store object that forces inflation
void* buf = malloc(kGiantSize); std::unique_ptr<char> bufPtr(new char[kGiantSize]);
void* buf = bufPtr.get();
memset(buf, 42, kGiantSize); memset(buf, 42, kGiantSize);
ASSERT_EQ(w->putBlob(0, 1, buf, kGiantSize), OK); ASSERT_EQ(w->putBlob(0, 1, buf, kGiantSize), OK);