Fix potential indexing into an empty vector in ANGLE tests

The tests are failing after "Warning: incomplete system info collection" which suggests systemInfo.gpus is empty. Check for that before indexing into the vector; defaulting the active index to zero in https://chromium-review.googlesource.com/c/angle/angle/+/1925031 was not sufficient and the line still needs a bounds check. Bug: chromium:923166, chromium:1032552 Change-Id: Ic9716830403e0dfcfa5d11539537c2a39e0e2386 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1959488Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>

Fix potential indexing into an empty vector in ANGLE tests
351307eb · David Benjamin · Commit Bot · 3eaf6294 · 351307eb
Commit 351307eb authored Dec 10, 2019 by David Benjamin Committed by Commit Bot Dec 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

angle_test_instantiate.cpp src/tests/test_utils/angle_test_instantiate.cpp +2 -1

No files found.
--- a/src/tests/test_utils/angle_test_instantiate.cpp
+++ b/src/tests/test_utils/angle_test_instantiate.cpp
@@ -260,7 +260,8 @@ bool IsNVIDIA()

 bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters &param)
 {
-    VendorID vendorID = systemInfo.gpus[systemInfo.activeGPUIndex].vendorId;
+    VendorID vendorID =
+        systemInfo.gpus.empty() ? 0 : systemInfo.gpus[systemInfo.activeGPUIndex].vendorId;

    // We support the default and null back-ends on every platform.
    if (param.driver == GLESDriverType::AngleEGL)