Skip to content

Commit ad7b8ef

Browse files
committedSep 19, 2023
OrcLib: PEInfo: SetFirstBytes: grab also bytes when <BYTES_IN_FIRSTBYTES
1 parent 7e89fdc commit ad7b8ef

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed
 

‎src/OrcLib/PEInfo.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//
21
// SPDX-License-Identifier: LGPL-2.1-or-later
32
//
43
// Copyright © 2011-2021 ANSSI. All Rights Reserved.
@@ -159,12 +158,15 @@ HRESULT PEInfo::OpenPEInformation()
159158
return hr;
160159
buf.SetCount(static_cast<size_t>(ullBytesRead));
161160

162-
if (buf.GetCount() >= BYTES_IN_FIRSTBYTES)
161+
if (!buf.empty())
163162
{
164163
CBinaryBuffer fb;
165-
if (!fb.SetCount(BYTES_IN_FIRSTBYTES))
164+
if (!fb.SetCount(std::min(static_cast<size_t>(BYTES_IN_FIRSTBYTES), buf.GetCount())))
165+
{
166166
return E_OUTOFMEMORY;
167-
CopyMemory(fb.GetData(), buf.GetData(), BYTES_IN_FIRSTBYTES);
167+
}
168+
169+
CopyMemory(fb.GetData(), buf.GetData(), fb.GetCount());
168170
m_FileInfo.GetDetails()->SetFirstBytes(std::move(fb));
169171
}
170172

0 commit comments

Comments
 (0)
Please sign in to comment.