Dan Kegel : msvcrt: Fix two buglets in heap test.

Alexandre Julliard julliard at winehq.org
Wed Nov 7 06:46:00 CST 2007


Module: wine
Branch: master
Commit: a1e4758f076190dbef7d06f9e10241d0aabe3788
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a1e4758f076190dbef7d06f9e10241d0aabe3788

Author: Dan Kegel <dank at kegel.com>
Date:   Tue Nov  6 16:52:19 2007 -0800

msvcrt: Fix two buglets in heap test.

---

 dlls/msvcrt/tests/heap.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c
index 6dac9b4..e2e9a4a 100644
--- a/dlls/msvcrt/tests/heap.c
+++ b/dlls/msvcrt/tests/heap.c
@@ -148,11 +148,12 @@ static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment)
                     }
                 }
             }
-        }
-        else
+            p_aligned_free(mem2);
+        } else {
             ok(errno == EINVAL, "_aligned_realloc(%p, %d, %d) errno: %d != %d\n", mem, size2, alignment, errno, EINVAL);
+            p_aligned_free(mem);
+        }
 
-        p_aligned_free(mem);
         free(mem1);
     }
     else
@@ -219,11 +220,12 @@ static void test_aligned_offset_realloc(size_t size1, size_t size2, size_t align
                     }
                 }
             }
-        }
-        else
+            p_aligned_free(mem2);
+        } else {
             ok(errno == EINVAL, "_aligned_offset_realloc(%p, %d, %d, %d) errno: %d != %d\n", mem, size2, alignment, offset, errno, EINVAL);
+            p_aligned_free(mem);
+        }
 
-        p_aligned_free(mem);
         free(mem1);
     }
     else
@@ -353,5 +355,8 @@ START_TEST(heap)
     mem = realloc(NULL, 0);
     ok(mem != NULL, "memory not (re)allocated for size 0\n");
 
+    if (mem)
+        free(mem);
+
     test_aligned();
 }




More information about the wine-cvs mailing list