Module: wine Branch: master Commit: 733bf916065da27ab11b2f21f7fe7b17cd9a34cf URL: https://gitlab.winehq.org/wine/wine/-/commit/733bf916065da27ab11b2f21f7fe7b1...
Author: Eric Pouech epouech@codeweavers.com Date: Mon Oct 9 09:46:33 2023 +0200
dbghelp: Simplify allocation code.
Signed-off-by: Eric Pouech epouech@codeweavers.com
---
dlls/dbghelp/dbghelp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 3ce3ef6f707..76761e4caf7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -400,17 +400,13 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) { size_t buf_size = 0, i, last_null = -1; WCHAR *buf = NULL; + WCHAR *new_buf;
do { size_t read_size = sysinfo.dwAllocationGranularity - (env & (sysinfo.dwAllocationGranularity - 1)); - if (buf) - { - WCHAR *new_buf; - if (!(new_buf = realloc(buf, buf_size + read_size))) break; - buf = new_buf; - } - else if(!(buf = malloc(read_size))) break; + if (!(new_buf = realloc(buf, buf_size + read_size))) break; + buf = new_buf;
if (!read_process_memory(pcs, env, (char*)buf + buf_size, read_size)) break; for (i = buf_size / sizeof(WCHAR); i < (buf_size + read_size) / sizeof(WCHAR); i++)