From 1bfae3ccf7589ffcd611a7d58102536d83e4ff68 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 27 Mar 2009 18:47:13 -0700
Subject: [PATCH] bugfix: don't dynamic link if we found a registered extension

* libguile/extensions.c (load_extension): Don't do dynamic linking if we
  actually did find an extension in the list.
---
 NEWS                  | 1 +
 libguile/extensions.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index b00b405fc..20c0f5531 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Changes in 1.8.8 (since 1.8.7)
 
 ** Fix possible buffer overruns when parsing numbers
 ** Avoid clash with system setjmp/longjmp on IA64
+** Don't dynamically link an extension that is already registered
 
 
 Changes in 1.8.7 (since 1.8.6)
diff --git a/libguile/extensions.c b/libguile/extensions.c
index 1090b8bd5..29cb58cbe 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -76,6 +76,7 @@ load_extension (SCM lib, SCM init)
     {
       extension_t *ext;
       char *clib, *cinit;
+      int found = 0;
 
       scm_dynwind_begin (0);
 
@@ -89,10 +90,14 @@ load_extension (SCM lib, SCM init)
 	    && !strcmp (ext->init, cinit))
 	  {
 	    ext->func (ext->data);
+            found = 1;
 	    break;
 	  }
 
       scm_dynwind_end ();
+
+      if (found)
+        return;
     }
 
   /* Dynamically link the library. */