Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a175ac authored by George Burgess's avatar George Burgess Committed by Gerrit Code Review
Browse files

Merge "CursorWindow_test: fix leaks"

parents 3b60cd3b 079077fd

libs/androidfw/tests/CursorWindow_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -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);