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

CursorWindow_test: fix leaks

Browse Source 
`buf` isn't freed here. Convert it to either a unique_ptr or stack
array, depending on size.

Caught by the static analyzer:
> frameworks/base/libs/androidfw/tests/CursorWindow_test.cpp:190:5:
warning: Potential leak of memory pointed to by 'buf'
[clang-analyzer-unix.Malloc]
> frameworks/base/libs/androidfw/tests/CursorWindow_test.cpp:268:5:
warning: Potential leak of memory pointed to by 'buf'
[clang-analyzer-unix.Malloc]
> frameworks/base/libs/androidfw/tests/CursorWindow_test.cpp:327:5:
warning: Potential leak of memory pointed to by 'buf'
[clang-analyzer-unix.Malloc]

Bug: 206470603
Test: TreeHugger
Change-Id: I6fee4a9c2eedce0385f794567b0083df24c63419
This commit is contained in:
George Burgess IV
2022-10-06 15:55:34 -07:00
parent 72154d309d
commit 079077fd77
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.
*/
#include <memory>
#include <utility>
#include "androidfw/CursorWindow.h"
@@ -184,7 +185,7 @@ TEST(CursorWindowTest, Inflate) {
ASSERT_EQ(w->allocRow(), OK);
// Scratch buffer that will fit before inflation
void* buf = malloc(kHalfInlineSize);
char buf[kHalfInlineSize];
// Store simple value
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
@@ -262,7 +263,7 @@ TEST(CursorWindowTest, ParcelSmall) {
ASSERT_EQ(w->allocRow(), OK);
// Scratch buffer that will fit before inflation
void* buf = malloc(kHalfInlineSize);
char buf[kHalfInlineSize];
// Store simple value
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
@@ -322,7 +323,8 @@ TEST(CursorWindowTest, ParcelLarge) {
ASSERT_EQ(w->putLong(0, 0, 0xcafe), OK);
// 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);
ASSERT_EQ(w->putBlob(0, 1, buf, kGiantSize), OK);