diff options
| author | 2018-12-01 22:25:10 -0500 | |
|---|---|---|
| committer | 2018-12-01 22:25:10 -0500 | |
| commit | 97e73591e3fb2705cbbd4fcbc33267d598fbba93 (patch) | |
| tree | 55756ed97c50e705d5c1d13ec9c8383ff8323538 | |
| parent | Fix debug build (diff) | |
| parent | Services/VI: Dereferencing an uninitialized std::optional is undefined behavior. (diff) | |
| download | yuzu-97e73591e3fb2705cbbd4fcbc33267d598fbba93.tar.gz yuzu-97e73591e3fb2705cbbd4fcbc33267d598fbba93.tar.xz yuzu-97e73591e3fb2705cbbd4fcbc33267d598fbba93.zip | |
Merge pull request #1830 from Subv/vi_ub
Services/VI: Dereferencing an uninitialized std::optional is undefined behavior.
| -rw-r--r-- | src/core/hle/service/vi/vi.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 5120abfff..412d5b0c9 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp | |||
| @@ -542,6 +542,8 @@ private: | |||
| 542 | // Repeat TransactParcel DequeueBuffer when a buffer is available | 542 | // Repeat TransactParcel DequeueBuffer when a buffer is available |
| 543 | auto buffer_queue = nv_flinger->GetBufferQueue(id); | 543 | auto buffer_queue = nv_flinger->GetBufferQueue(id); |
| 544 | std::optional<u32> slot = buffer_queue->DequeueBuffer(width, height); | 544 | std::optional<u32> slot = buffer_queue->DequeueBuffer(width, height); |
| 545 | ASSERT_MSG(slot != std::nullopt, "Could not dequeue buffer."); | ||
| 546 | |||
| 545 | IGBPDequeueBufferResponseParcel response{*slot}; | 547 | IGBPDequeueBufferResponseParcel response{*slot}; |
| 546 | ctx.WriteBuffer(response.Serialize()); | 548 | ctx.WriteBuffer(response.Serialize()); |
| 547 | IPC::ResponseBuilder rb{ctx, 2}; | 549 | IPC::ResponseBuilder rb{ctx, 2}; |