[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-83-gf2ed447

[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=f2ed447383f0398777719a2cda92c38e9838bf85

The branch, stable-2.0 has been updated
       via  f2ed447383f0398777719a2cda92c38e9838bf85 (commit)
      from  b34608813de5fce7f8caee63bdbaeab445eb366e (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 f2ed447383f0398777719a2cda92c38e9838bf85
Author: Andy Wingo <address@hidden>
Date:   Mon May 23 22:38:13 2011 +0200

    set-procedure-property! threadsafety issue
    
    * libguile/procprop.c (scm_set_procedure_property_x): Fix a threadsafety
      bug pointed out by Ken Raeburn.

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

Summary of changes:
 libguile/procprop.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libguile/procprop.c b/libguile/procprop.c
index 2263d28..c3fb90e 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1998,2000,2001,2003,2004, 2006, 2008, 2009, 2010 
Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001,2003,2004, 2006, 2008, 2009, 2010, 
2011 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
@@ -184,14 +184,15 @@ SCM_DEFINE (scm_set_procedure_property_x, 
"set-procedure-property!", 3, 0, 0,
     SCM_MISC_ERROR ("arity is a deprecated read-only property", SCM_EOL);
 #endif
 
-  props = scm_procedure_properties (proc);
-
-#if (SCM_ENABLE_DEPRECATED == 1)
-  /* cdr past the consed-on arity. */
-  props = scm_cdr (props);
-#endif
-
   scm_i_pthread_mutex_lock (&overrides_lock);
+  props = scm_hashq_ref (overrides, proc, SCM_BOOL_F);
+  if (scm_is_false (props))
+    {
+      if (SCM_PROGRAM_P (proc))
+        props = scm_i_program_properties (proc);
+      else
+        props = SCM_EOL;
+    }
   scm_hashq_set_x (overrides, proc, scm_assq_set_x (props, key, val));
   scm_i_pthread_mutex_unlock (&overrides_lock);
 


hooks/post-receive
-- 
GNU Guile