[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-114-g7c4a645

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=7c4a6456982254440d4e145fe0b250693a11975e

The branch, master has been updated
       via  7c4a6456982254440d4e145fe0b250693a11975e (commit)
      from  913ddf05745a691c71291aba47fc901fc7ead1de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c4a6456982254440d4e145fe0b250693a11975e
Author: Andy Wingo <address@hidden>
Date:   Sat Jan 9 23:11:23 2010 +0100

    fix SCM_STACK_OVERFLOW_P bug
    
    * libguile/stackchk.h (SCM_STACK_OVERFLOW_P): Fix a potential overflow,
      depending on the absolute values of the thread base and the stack
      limit. Thanks to Ivan Shcherbakov for the report.

-----------------------------------------------------------------------

Summary of changes:
 THANKS              |    1 +
 libguile/stackchk.h |    8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/THANKS b/THANKS
index 94b86a1..30d57fc 100644
--- a/THANKS
+++ b/THANKS
@@ -102,6 +102,7 @@ For fixes or providing information which led to a fix:
          Frank Schwidom
     John Steele Scott
          Thiemo Seufer
+           Ivan Shcherbakov
           Scott Shedden
            Alex Shinn
          Daniel Skarda
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index ed14906..68dec76 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -3,7 +3,7 @@
 #ifndef SCM_STACKCHK_H
 #define SCM_STACKCHK_H
 
-/* Copyright (C) 1995,1996,1998,2000, 2003, 2006, 2008, 2009 Free Software 
Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000, 2003, 2006, 2008, 2009, 2010 Free 
Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -37,12 +37,10 @@
 #if defined BUILDING_LIBGUILE && defined STACK_CHECKING
 # if SCM_STACK_GROWS_UP
 #  define SCM_STACK_OVERFLOW_P(s)\
-   (SCM_STACK_PTR (s) \
-    > (SCM_I_CURRENT_THREAD->base + SCM_STACK_LIMIT))
+   ((SCM_STACK_PTR (s) - SCM_I_CURRENT_THREAD->base) > SCM_STACK_LIMIT)
 # else
 #  define SCM_STACK_OVERFLOW_P(s)\
-   (SCM_STACK_PTR (s) \
-    < (SCM_I_CURRENT_THREAD->base - SCM_STACK_LIMIT))
+   ((SCM_I_CURRENT_THREAD->base - SCM_STACK_PTR (s)) > SCM_STACK_LIMIT)
 # endif
 # define SCM_CHECK_STACK\
     {\


hooks/post-receive
-- 
GNU Guile