Browse Source

Stop using malloc_usable_size(): valgrind hates it.

Nick Mathewson 15 years ago
parent
commit
11b9c839f0
2 changed files with 6 additions and 1 deletions
  1. 3 0
      ChangeLog
  2. 3 1
      src/common/util.c

+ 3 - 0
ChangeLog

@@ -18,6 +18,9 @@ Changes in version 0.2.1.15??? - ????-??-??
       memory right up to the end of a memarea, then realigned the
       memory one step beyond the end.  Fixes a possible cause of bug
       930.
+    - Stop using malloc_usable_size() to use more area than we had
+      actually allocated: it was safe, but made valgrind really
+      unhappy.  Bugfix on 0.2.0.x.
 
 
 Changes in version 0.2.1.14-rc - 2009-04-12

+ 3 - 1
src/common/util.c

@@ -258,7 +258,9 @@ _tor_malloc_roundup(size_t *sizep DMALLOC_PARAMS)
 #ifdef HAVE_MALLOC_GOOD_SIZE
   *sizep = malloc_good_size(*sizep);
   return _tor_malloc(*sizep DMALLOC_FN_ARGS);
-#elif defined(HAVE_MALLOC_USABLE_SIZE) && !defined(USE_DMALLOC)
+#elif 0 && defined(HAVE_MALLOC_USABLE_SIZE) && !defined(USE_DMALLOC)
+  /* Never use malloc_usable_size(); it makes valgrind really unhappy,
+   * and doesn't win much in terms of usable space where it exists. */
   void *result = _tor_malloc(*sizep DMALLOC_FN_ARGS);
   *sizep = malloc_usable_size(result);
   return result;