Pre-release patch for 1.115.0, fixing test/function/26.c, which was a…

…llocating a chunk with zero size available for allocations. Copied from Perforce Change: 190728 ServerID: perforce.ravenbrook.com
Ravenbrook · Apr 5, 2016 · 5907ae5 · 5907ae5
1 parent 2eadfb8
commit 5907ae5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/arenavm.c b/code/arenavm.c
@@ -711,7 +711,7 @@ static Res VMArenaGrow(Arena arena, LocusPref pref, Size size)
   {
     unsigned fidelity = 8;  /* max fraction of addr-space we may 'waste' */
     Size chunkHalf;
-    Size chunkMin = 4 * 1024;  /* typical single page */
+    Size chunkMin = 4 * ArenaGrainSize(arena); /* FIXME: What is the actual minimum? */
     Size sliceSize;
 
     if (vmArena->extendMin > chunkMin)

diff --git a/code/land.c b/code/land.c
@@ -198,6 +198,7 @@ Res LandInsert(Range rangeReturn, Land land, Range range)
   AVERT(Land, land);
   AVERT(Range, range);
   AVER(RangeIsAligned(range, land->alignment));
+  AVER(RangeSize(range) > 0);
   landEnter(land);
 
   res = (*land->class->insert)(rangeReturn, land, range);