From f5e2fc1d0bb2a28d3bbd9140ee40b981ce4ff1f4 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 28 May 2016 20:06:27 -0400 Subject: [PATCH 1/2] preparing to git bisect --- linux_4ed.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_4ed.cpp b/linux_4ed.cpp index 2045e85d..1b2cf801 100644 --- a/linux_4ed.cpp +++ b/linux_4ed.cpp @@ -2214,7 +2214,7 @@ main(int argc, char **argv) memory_vars.user_memory_size = Mbytes(2); memory_vars.user_memory = mmap(0, memory_vars.user_memory_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); #endif - + String current_directory; i32 curdir_req, curdir_size; char *curdir_mem; From 51fb02828301f2721dcdc9692387d9eb663c45ba Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 28 May 2016 20:31:49 -0400 Subject: [PATCH 2/2] fix issue with general_memory_check: sentinel is not necessarily less than the first bubble --- 4ed_mem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4ed_mem.cpp b/4ed_mem.cpp index 535dbee8..e0009911 100644 --- a/4ed_mem.cpp +++ b/4ed_mem.cpp @@ -77,7 +77,7 @@ general_memory_check(General_Memory *general){ Bubble *next = bubble->next; Assert(bubble == next->prev); - if (next != sentinel){ + if (next != sentinel && bubble->prev != sentinel){ Assert(bubble->next > bubble); Assert(bubble > bubble->prev);