Unverified Commit 15dc3384 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.3.4' into maint-0.3.5

parents 1216f995 1a194beb
Loading
Loading
Loading
Loading

changes/bug29145

0 → 100644
+3 −0
Original line number Diff line number Diff line
  o Minor bugfixes (compilation, testing):
    - Silence a compiler warning in test-memwipe.c on OpenBSD.  Fixes
      bug 29145; bugfix on 0.2.9.3-alpha.  Patch from Kris Katterjohn.
+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ const char *s = NULL;
#ifdef OpenBSD
/* Disable some of OpenBSD's malloc protections for this test. This helps
 * us do bad things, such as access freed buffers, without crashing. */
extern const char *malloc_options;
const char *malloc_options = "sufjj";
#endif