New upstream version 1.3.0+dfsg.1

[libgit2.git] / tests / buf / oom.c

diff --git a/tests/buf/oom.c b/tests/buf/oom.c
index b9fd29cbb0a40fdd95ceeb91bed0634f6a491291..726234ef89ea8f69bd51d2bedc55a230dc3b7c86 100644 (file)
--- a/tests/buf/oom.c
+++ b/tests/buf/oom.c
@@ -1,41 +1,59 @@
 #include "clar_libgit2.h"
 #include "buffer.h"
 
-#if defined(GIT_ARCH_64)
-#define TOOBIG 0xffffffffffffff00
-#else
-#define TOOBIG 0xffffff00
-#endif
-
-/**
- * If we make a ridiculously large request the first time we
- * actually allocate some space in the git_buf, the realloc()
- * will fail.  And because the git_buf_grow() wrapper always
- * sets mark_oom, the code in git_buf_try_grow() will free
- * the internal buffer and set it to git_buf__oom.
- * 
- * We initialized the internal buffer to (the static variable)
- * git_buf__initbuf.  The purpose of this test is to make sure
- * that we don't try to free the static buffer.
- */
+/* Override default allocators with ones that will fail predictably. */
+
+static git_allocator std_alloc;
+static git_allocator oom_alloc;
+
+static void *oom_malloc(size_t n, const char *file, int line)
+{
+       /* Reject any allocation of more than 100 bytes */
+       return (n > 100) ? NULL : std_alloc.gmalloc(n, file, line);
+}
+
+static void *oom_realloc(void *p, size_t n, const char *file, int line)
+{
+       /* Reject any allocation of more than 100 bytes */
+       return (n > 100) ? NULL : std_alloc.grealloc(p, n, file, line);
+}
+
+void test_buf_oom__initialize(void)
+{
+       git_stdalloc_init_allocator(&std_alloc);
+       git_stdalloc_init_allocator(&oom_alloc);
+
+       oom_alloc.gmalloc = oom_malloc;
+       oom_alloc.grealloc = oom_realloc;
+
+       cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, &oom_alloc));
+}
+
+void test_buf_oom__cleanup(void)
+{
+       cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, NULL));
+}
+
 void test_buf_oom__grow(void)
 {
        git_buf buf = GIT_BUF_INIT;
 
-       git_buf_clear(&buf);
+       cl_git_pass(git_buf_grow(&buf, 42));
+       cl_assert(!git_buf_oom(&buf));
 
-       cl_assert(git_buf_grow(&buf, TOOBIG) == -1);
+       cl_assert(git_buf_grow(&buf, 101) == -1);
        cl_assert(git_buf_oom(&buf));
 
-       git_buf_free(&buf);
+       git_buf_dispose(&buf);
 }
 
 void test_buf_oom__grow_by(void)
 {
        git_buf buf = GIT_BUF_INIT;
 
-       buf.size = SIZE_MAX-10;
+       cl_git_pass(git_buf_grow_by(&buf, 42));
+       cl_assert(!git_buf_oom(&buf));
 
-       cl_assert(git_buf_grow_by(&buf, 50) == -1);
+       cl_assert(git_buf_grow_by(&buf, 101) == -1);
        cl_assert(git_buf_oom(&buf));
 }