Capture/Replay: Don't try to serialize blob without data

The construct std::vector v; &v[0] doesn't go well with a checked STL, because the element 0 doesn't exists in an empty vector, and obviously it doesn't know that whether the pointer gets de-referenced later. Bug: angleproject:5980 Change-Id: I690c99bd12d74112fe1081ea3134b6ffb11ad23b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2900226Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Gert Wollny <gert.wollny@collabora.com>

Capture/Replay: Don't try to serialize blob without data
45ee87e2 · Gert Wollny · Angle LUCI CQ · 6622d2b4 · 45ee87e2 · 45ee87e2
Commit 45ee87e2 authored May 17, 2021 by Gert Wollny Committed by Angle LUCI CQ May 20, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

JsonSerializer.h src/libANGLE/serializer/JsonSerializer.h +8 -1

capture_replay_expectations.txt ...ests/capture_replay_tests/capture_replay_expectations.txt +3 -1

No files found.
--- a/src/libANGLE/serializer/JsonSerializer.h
+++ b/src/libANGLE/serializer/JsonSerializer.h
@@ -93,7 +93,14 @@ class JsonSerializer : public angle::NonCopyable
    template <typename T>
    void addVectorAsHash(const std::string &name, const std::vector<T> &value)
    {
-        addBlob(name, reinterpret_cast<const uint8_t *>(&value[0]), value.size() * sizeof(T));
+        if (!value.empty())
+        {
+            addBlob(name, reinterpret_cast<const uint8_t *>(&value[0]), value.size() * sizeof(T));
+        }
+        else
+        {
+            addCString(name, "null");
+        }
    }
    void addVectorOfStrings(const std::string &name, const std::vector<std::string> &value);

--- a/src/tests/capture_replay_tests/capture_replay_expectations.txt
+++ b/src/tests/capture_replay_tests/capture_replay_expectations.txt
@@ -28,6 +28,9 @@ IndexBufferOffsetTest.UInt32IndexSmallUpdates/*
 IndexBufferOffsetTest.UInt8Index/*
 IndexBufferOffsetTest.UInt8IndexSmallUpdates/*
+# Flanky tests, pass standalone, but fail in a group
+ColorMaskTest.AMDZeroColorMaskBug/ES3_OpenGL
 # Has undefined framebuffer pixels. This fails comparison checks.
 SimpleOperationTest.ClearAndSwap/*
 SimpleOperationTest.DrawQuadAndSwap/*
@@ -36,7 +39,6 @@ SimpleOperationTest.DrawQuadAndSwap/*
 BlitFramebufferANGLETest.*
 BufferDataTest.*
 ClipDistanceTest.*
-ColorMaskTest.*
 CopyCompressedTextureTest.InternalFormat/*
 DebugMarkerTest.*
 DebugTest.*