[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-64-gb7c1b60

[Mark H Weaver]

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=b7c1b60c83098abf83c39b724e4e96eae8478c53

The branch, stable-2.0 has been updated
       via  b7c1b60c83098abf83c39b724e4e96eae8478c53 (commit)
      from  fa102e73c3d14f52d089ec2faa55c9a7e87f4a23 (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 b7c1b60c83098abf83c39b724e4e96eae8478c53
Author: Mark H Weaver <address@hidden>
Date:   Fri Aug 9 18:23:56 2013 -0400

    dereference-pointer: check for null pointer.
    
    * libguile/foreign.c (scm_dereference_pointer): Check for attempts to
      dereference a null pointer.
    
    * test-suite/tests/foreign.test ("null pointer"): Add test.

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

Summary of changes:
 libguile/foreign.c            |    8 +++++++-
 test-suite/tests/foreign.test |    4 ++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/libguile/foreign.c b/libguile/foreign.c
index 90a4fca..01af900 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -342,9 +342,15 @@ SCM_DEFINE (scm_dereference_pointer, 
"dereference-pointer", 1, 0, 0,
            "holds a pointer, return this pointer.")
 #define FUNC_NAME s_scm_dereference_pointer
 {
+  void **ptr;
+
   SCM_VALIDATE_POINTER (1, pointer);
 
-  return scm_from_pointer (* (void **) SCM_POINTER_VALUE (pointer), NULL);
+  ptr = SCM_POINTER_VALUE (pointer);
+  if (SCM_UNLIKELY (ptr == NULL))
+    null_pointer_error (FUNC_NAME);
+
+  return scm_from_pointer (*ptr, NULL);
 }
 #undef FUNC_NAME
 
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test
index 4b129db..acdb3db 100644
--- a/test-suite/tests/foreign.test
+++ b/test-suite/tests/foreign.test
@@ -51,6 +51,10 @@
   (pass-if "null-pointer? %null-pointer"
     (null-pointer? %null-pointer))
 
+  (pass-if-exception "dereference-pointer %null-pointer"
+    exception:null-pointer-error
+    (dereference-pointer %null-pointer))
+
   (pass-if-exception "pointer->bytevector %null-pointer"
     exception:null-pointer-error
     (pointer->bytevector %null-pointer 7)))


hooks/post-receive
-- 
GNU Guile