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

Commit 56cda83f authored by Lev Proleev's avatar Lev Proleev
Browse files

Fix use-after-free error in NNAPI VTS tests 

Replace std::initializer_list with std::vector.

Fix: 145705114
Test: VtsHalNeuralnetworksV1_[23]TargetTest
Change-Id: I92cbc56b2b8fbb36b3f3225e7cd0d4b05c84041e
parent ca0e5aa8

neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp

+5 −4
Original line number Diff line number Diff line
@@ -29,13 +29,14 @@ 
#include <android/hardware/neuralnetworks/1.2/IPreparedModelCallback.h>

#include <android/hidl/allocator/1.0/IAllocator.h>

#include <android/hidl/memory/1.0/IMemory.h>

#include <gtest/gtest.h>

#include <hidlmemory/mapping.h>



#include <gtest/gtest.h>

#include <algorithm>

#include <chrono>

#include <iostream>

#include <numeric>

#include <vector>



#include "1.0/Utils.h"

#include "1.2/Callbacks.h"
@@ -333,9 +334,9 @@ void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel, const TestMo 


void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel, const TestModel& testModel,

                           bool testDynamicOutputShape) {

    std::initializer_list<OutputType> outputTypesList;

    std::initializer_list<MeasureTiming> measureTimingList;

    std::initializer_list<Executor> executorList;

    std::vector<OutputType> outputTypesList;

    std::vector<MeasureTiming> measureTimingList;

    std::vector<Executor> executorList;



    if (testDynamicOutputShape) {

        outputTypesList = {OutputType::UNSPECIFIED, OutputType::INSUFFICIENT};

neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp

+8 −9
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ 
#include <android/hardware/neuralnetworks/1.3/types.h>

#include <android/hidl/allocator/1.0/IAllocator.h>

#include <android/hidl/memory/1.0/IMemory.h>

#include <gtest/gtest.h>

#include <hidlmemory/mapping.h>



#include <gtest/gtest.h>

#include <algorithm>

#include <chrono>

#include <iostream>

#include <numeric>

#include <vector>



#include "1.0/Utils.h"

#include "1.2/Callbacks.h"
@@ -368,9 +369,9 @@ void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel, const TestMo 


void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel, const TestModel& testModel,

                           TestKind testKind) {

    std::initializer_list<OutputType> outputTypesList;

    std::initializer_list<MeasureTiming> measureTimingList;

    std::initializer_list<Executor> executorList;

    std::vector<OutputType> outputTypesList;

    std::vector<MeasureTiming> measureTimingList;

    std::vector<Executor> executorList;



    switch (testKind) {

        case TestKind::GENERAL: {
@@ -403,11 +404,9 @@ void EvaluatePreparedCoupledModels(const sp<IPreparedModel>& preparedModel, 
                                   const TestModel& testModel,

                                   const sp<IPreparedModel>& preparedCoupledModel,

                                   const TestModel& coupledModel) {

    std::initializer_list<OutputType> outputTypesList = {OutputType::FULLY_SPECIFIED};

    std::initializer_list<MeasureTiming> measureTimingList = {MeasureTiming::NO,

                                                              MeasureTiming::YES};

    std::initializer_list<Executor> executorList = {Executor::ASYNC, Executor::SYNC,

                                                    Executor::BURST};

    const std::vector<OutputType> outputTypesList = {OutputType::FULLY_SPECIFIED};

    const std::vector<MeasureTiming> measureTimingList = {MeasureTiming::NO, MeasureTiming::YES};

    const std::vector<Executor> executorList = {Executor::ASYNC, Executor::SYNC, Executor::BURST};



    for (const OutputType outputType : outputTypesList) {

        for (const MeasureTiming measureTiming : measureTimingList) {