MonetDB: Aug2011 - reallocStack: disable incorrect code

[Fabian Groffen]

Changeset: 9f07efd80e52 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f07efd80e52
Modified Files:
        monetdb5/mal/mal_stack.c
Branch: Aug2011
Log Message:

reallocStack: disable incorrect code

This function can never do something useful, disable it, because the
stack protector doesn't like the alloca in this function.


diffs (36 lines):

diff --git a/monetdb5/mal/mal_stack.c b/monetdb5/mal/mal_stack.c
--- a/monetdb5/mal/mal_stack.c
+++ b/monetdb5/mal/mal_stack.c
@@ -95,6 +95,8 @@
        return s;
 }
 
+#if 0
+/* dark code, we need quite some lux to shed a little light on this */
 MalStkPtr
 reallocStack(MalStkPtr s, int cnt)
 {
@@ -113,6 +115,7 @@
        GDKfree(old);
        return s;
 }
+#endif
 
 /*
  * @-
@@ -124,9 +127,15 @@
 void
 chkStack(MalStkPtr stk, int i)
 {
+#if 0
+/* avoid the darkness */
        if (stk->stksize <= i) {
                reallocStack(stk, STACKINCR);
        }
+#else
+       (void)stk;
+       (void)i;
+#endif
 }
 void
 freeStack(MalStkPtr stk)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list