Fix memory bounds checks; specialization of multi-argument polymorphic function works

2 files changed, 14 insertions, 8 deletions

diff --git a/src/c/urweb.c b/src/c/urweb.c
index 94a826c9..37b8853c 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -145,13 +145,16 @@ char *uw_get_optional_input(uw_context ctx, int n) {
 
 static void uw_check_heap(uw_context ctx, size_t extra) {
   if (ctx->heap_back - ctx->heap_front < extra) {
-    size_t desired = ctx->heap_back - ctx->heap_front + extra, next;
+    size_t desired = ctx->heap_back - ctx->heap + extra, next;
     char *new_heap;
 
-    for (next = ctx->heap_back - ctx->heap_front; next < desired; next *= 2);
+    next = ctx->heap_back - ctx->heap;
+    if (next == 0)
+      next = 1;
+    for (; next < desired; next *= 2);
 
     new_heap = realloc(ctx->heap, next);
-    ctx->heap_front = new_heap;
+    ctx->heap_front = new_heap + (ctx->heap_back - ctx->heap_front);
     ctx->heap_back = new_heap + next;
 
     if (new_heap != ctx->heap) {
@@ -192,14 +195,17 @@ int uw_send(uw_context ctx, int sock) {
 }
 
 static void uw_check(uw_context ctx, size_t extra) {
-  size_t desired = ctx->page_back - ctx->page_front + extra, next;
+  size_t desired = ctx->page_back - ctx->page + extra, next;
   char *new_page;
 
-  for (next = ctx->page_back - ctx->page_front; next < desired; next *= 2);
+  next = ctx->page_back - ctx->page;
+  if (next == 0)
+    next = 1;
+  for (; next < desired; next *= 2);
 
   new_page = realloc(ctx->page, next);
   ctx->page_front = new_page + (ctx->page_front - ctx->page);
-  ctx->page_back = new_page + (ctx->page_back - ctx->page);
+  ctx->page_back = new_page + next;
   ctx->page = new_page;
 }
 
diff --git a/src/compiler.sml b/src/compiler.sml
index aad6bdf3..b2f5fc96 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -481,8 +481,8 @@ val toSqlify = transform sqlify "sqlify" o toMono_opt2
 
 fun compileC {cname, oname, ename} =
     let
-        val compile = "gcc -Wstrict-prototypes -Werror -s -O3 -I include -c " ^ cname ^ " -o " ^ oname
-        val link = "gcc -Werror -s -O3 -pthread -lpq clib/urweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
+        val compile = "gcc -Wstrict-prototypes -Werror -O3 -I include -c " ^ cname ^ " -o " ^ oname
+        val link = "gcc -Werror -O3 -pthread -lpq clib/urweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
     in
         if not (OS.Process.isSuccess (OS.Process.system compile)) then
             print "C compilation failed\n"