From fe7cda57e46aa133cf84abc76308388bbf091cbb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Jan 2014 23:07:04 +0100 Subject: util/PeakBuffer: fix nullptr dereference when peak_size==0 --- src/util/PeakBuffer.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/util/PeakBuffer.cxx b/src/util/PeakBuffer.cxx index 8358949c1..e4624bbec 100644 --- a/src/util/PeakBuffer.cxx +++ b/src/util/PeakBuffer.cxx @@ -122,8 +122,9 @@ PeakBuffer::Append(const void *data, size_t length) return true; } - if (peak_buffer == nullptr && peak_size > 0) { - peak_buffer = new DynamicFifoBuffer(peak_size); + if (peak_buffer == nullptr) { + if (peak_size > 0) + peak_buffer = new DynamicFifoBuffer(peak_size); if (peak_buffer == nullptr) return false; } -- cgit v1.2.3