diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-26 17:32:45 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-31 13:20:44 -0500 |
commit | 0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153 (patch) | |
tree | 0b20cc3b0fd9f21616d09420fa0c1a90c20a70a0 /src/libs/dutil/WixToolset.DUtil/metautil.cpp | |
parent | 6f062d1e816ff8d3127ddcbdc7ee0335873bbab8 (diff) | |
download | wix-0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153.tar.gz wix-0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153.tar.bz2 wix-0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153.zip |
Add MemSizeChecked.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/metautil.cpp')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/metautil.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/metautil.cpp b/src/libs/dutil/WixToolset.DUtil/metautil.cpp index f313fc1c..c36aa96c 100644 --- a/src/libs/dutil/WixToolset.DUtil/metautil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/metautil.cpp | |||
@@ -300,7 +300,10 @@ extern "C" HRESULT DAPI MetaGetValue( | |||
300 | } | 300 | } |
301 | else // set the size of the data to the actual size of the memory | 301 | else // set the size of the data to the actual size of the memory |
302 | { | 302 | { |
303 | SIZE_T cb = MemSize(pmr->pbMDData); | 303 | SIZE_T cb = 0; |
304 | hr = MemSizeChecked(pmr->pbMDData, &cb); | ||
305 | MetaExitOnFailure(hr, "failed to get metabase size"); | ||
306 | |||
304 | if (cb > DWORD_MAX) | 307 | if (cb > DWORD_MAX) |
305 | { | 308 | { |
306 | MetaExitOnRootFailure(hr = E_INVALIDSTATE, "metabase data is too large: %Iu", cb); | 309 | MetaExitOnRootFailure(hr = E_INVALIDSTATE, "metabase data is too large: %Iu", cb); |