Capture/Replay: Fix CaptureShaderSource_string.

Was accessing a buffer out-of-bounds. Also wasn't handling negative length. Test: ASAN build Bug: angleproject:3611 Change-Id: I0f1cfa09d0488de20928d90e910803d98c225968 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1796082Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Capture/Replay: Fix CaptureShaderSource_string.
0b8eca79 · Jamie Madill · Commit Bot · 79ad0411 · 0b8eca79
Commit 0b8eca79 authored Sep 10, 2019 by Jamie Madill Committed by Commit Bot Sep 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

capture_gles_2_0_params.cpp src/libANGLE/capture_gles_2_0_params.cpp +4 -3

No files found.
--- a/src/libANGLE/capture_gles_2_0_params.cpp
+++ b/src/libANGLE/capture_gles_2_0_params.cpp
@@ -643,10 +643,11 @@ void CaptureShaderSource_string(const Context *context,
 {
    for (GLsizei index = 0; index < count; ++index)
    {
+        size_t len = ((length && length[index] >= 0) ? length[index] : strlen(string[index]));
        // includes the '\0' suffix
-        size_t len = (length ? length[index] : strlen(string[index])) + 1;
-        CaptureMemory(string[index], len, paramCapture);
-        paramCapture->data[paramCapture->data.size() - 1][len] = '\0';
+        std::vector<uint8_t> data(len + 1, 0);
+        memcpy(data.data(), string[index], len);
+        paramCapture->data.emplace_back(std::move(data));
    }
 }