Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2262/pathfinder/runtime

Modified Files:
      Tag: Nov2009
        pathfinder.mx 
Log Message:

use more conservative stack limit (PFmaxstack)
for too deep recusion check (PFrecursion_fence())
to prevent segfault (due to too deep recursion and
consequent stack overflow) in tests
tests/BugTracker/Tests/collection_management.SF-1726599.*
tests/BugTracker/Tests/crash_on_concatenated_query.SF-1730547.*
cf.,
https://sourceforge.net/tracker/?func=detail&aid=1607210&group_id=56967&atid=482468
https://sourceforge.net/tracker/?func=detail&aid=1730547&group_id=56967&atid=482468


Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.462.4.11
retrieving revision 1.462.4.12
diff -u -d -r1.462.4.11 -r1.462.4.12
--- pathfinder.mx       18 Nov 2009 14:56:52 -0000      1.462.4.11
+++ pathfinder.mx       21 Nov 2009 14:32:26 -0000      1.462.4.12
@@ -4768,7 +4768,7 @@
                local var to conservatively estimate bottom of stack
                and to have some slack after last test, then subtract
                stack size to find top */
-            PFmaxstack = ((char*) &xquery) + sizeof(size_t)*2048 - 
THREAD_STACK_SIZE;
+            PFmaxstack = ((char*) &xquery) + sizeof(size_t)*4096 - 
THREAD_STACK_SIZE;
 #if defined(_MSC_VER) && SIZEOF_SIZE_T == 8
             /* On Windows, the application stack (i.e. the stack of
                the main thread) is 1 MB.  On 64 bit Windows, our
@@ -4778,7 +4778,7 @@
                again for a 1 MB stack.
                Did somebody say HACK? */
             if (PFmaxstack > (char*) &xquery)
-                    PFmaxstack = ((char*) &xquery) + sizeof(size_t)*2048 - 
1024*1024;
+                    PFmaxstack = ((char*) &xquery) + sizeof(size_t)*4096 - 
1024*1024;
 #endif
             PFerrbuf = ctx->errbuf;
             PFerrbuf[0] = 0;


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to