From 0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 26 May 2022 17:32:45 -0500 Subject: Add MemSizeChecked. --- src/libs/dutil/WixToolset.DUtil/buffutil.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/libs/dutil/WixToolset.DUtil/buffutil.cpp') diff --git a/src/libs/dutil/WixToolset.DUtil/buffutil.cpp b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp index b6d58cc0..acde4dc9 100644 --- a/src/libs/dutil/WixToolset.DUtil/buffutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp @@ -508,10 +508,14 @@ static HRESULT EnsureBufferSize( { HRESULT hr = S_OK; SIZE_T cbTarget = ((cbSize / BUFFER_INCREMENT) + 1) * BUFFER_INCREMENT; + SIZE_T cbCurrent = 0; if (*ppbBuffer) { - if (MemSize(*ppbBuffer) < cbTarget) + hr = MemSizeChecked(*ppbBuffer, &cbCurrent); + BuffExitOnFailure(hr, "Failed to get current buffer size."); + + if (cbCurrent < cbTarget) { LPVOID pv = MemReAlloc(*ppbBuffer, cbTarget, TRUE); BuffExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to reallocate buffer."); -- cgit v1.2.3-55-g6feb