From 8aabf1b37420f8a67b88f7cecbbd09f888a27bdf Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 1 Feb 2020 21:43:48 -0500 Subject: [PATCH] Allows receivers of nullptr from begin_data to output any quantity of data. --- Outputs/CRT/CRT.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Outputs/CRT/CRT.hpp b/Outputs/CRT/CRT.hpp index 018f83c5b..be07a50ba 100644 --- a/Outputs/CRT/CRT.hpp +++ b/Outputs/CRT/CRT.hpp @@ -236,10 +236,15 @@ class CRT { @returns A pointer to the allocated area if room is available; @c nullptr otherwise. */ inline uint8_t *begin_data(std::size_t required_length, std::size_t required_alignment = 1) { + const auto result = scan_target_->begin_data(required_length, required_alignment); #ifndef NDEBUG - allocated_data_length_ = required_length; + // If data was allocated, make a record of how much so as to be able to hold the caller to that + // contract later. If allocation failed, don't constrain the caller. This allows callers that + // allocate on demand but may allow one failure to hold for a longer period — e.g. until the + // next line. + allocated_data_length_ = result ? required_length : std::numeric_limits::max(); #endif - return scan_target_->begin_data(required_length, required_alignment); + return result; } /*! Sets the gamma exponent for the simulated screen. */