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

Commit 6f906c15 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

VTS: Verify no duplicate entries between partial results 

Partial results are appended together. If there are duplicate entries
between partial results, there will be more than more entries for a tag
in the final result. This can cause undefined behavior, especially when
they have different values.

Test: Run Camera VTS test on Pixel devices
Bug: 170575182
Change-Id: I931660cef16a90ee0c247e3c4513a88adb7211ab
parent 6b085781

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+21 −3
Original line number Diff line number Diff line
@@ -1260,9 +1260,27 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r 
            ADD_FAILURE();

            return notify;

        }

        request->collectedResult.append(

                reinterpret_cast<const camera_metadata_t*>(

                    resultMetadata.data()));



        // Verify no duplicate tags between partial results

        const camera_metadata_t* partialMetadata =

                reinterpret_cast<const camera_metadata_t*>(resultMetadata.data());

        const camera_metadata_t* collectedMetadata = request->collectedResult.getAndLock();

        camera_metadata_ro_entry_t searchEntry, foundEntry;

        for (size_t i = 0; i < get_camera_metadata_size(partialMetadata); i++) {

            if (0 != get_camera_metadata_ro_entry(partialMetadata, i, &searchEntry)) {

                ADD_FAILURE();

                request->collectedResult.unlock(collectedMetadata);

                return notify;

            }

            if (-ENOENT !=

                find_camera_metadata_ro_entry(collectedMetadata, searchEntry.tag, &foundEntry)) {

                ADD_FAILURE();

                request->collectedResult.unlock(collectedMetadata);

                return notify;

            }

        }

        request->collectedResult.unlock(collectedMetadata);

        request->collectedResult.append(partialMetadata);



        isPartialResult =

            (results.partialResult < request->numPartialResults);