msvcrt: Pass on the return value in _callnewh.

Also try to avoid race conditions by storing the new handler in a local variable before checking whether it's non-null. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Pass on the return value in _callnewh.
e66758dd · Martin Storsjo · Alexandre Julliard · eb5f7531 · e66758dd
Commit e66758dd authored Nov 06, 2015 by Martin Storsjo Committed by Alexandre Julliard Nov 09, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

heap.c dlls/msvcrt/heap.c +5 -3

No files found.
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -234,9 +234,11 @@ int CDECL MSVCRT__set_new_mode(int mode)
 */
 int CDECL _callnewh(MSVCRT_size_t size)
 {
-  if(MSVCRT_new_handler)
-    (*MSVCRT_new_handler)(size);
-  return 0;
+  int ret = 0;
+  MSVCRT_new_handler_func handler = MSVCRT_new_handler;
+  if(handler)
+    ret = (*handler)(size) ? 1 : 0;
+  return ret;
 }

 /*********************************************************************