diff options
| author | Andy Wingo <wingo@pobox.com> | 2009-03-27 18:47:13 -0700 |
|---|---|---|
| committer | Neil Jerram <neil@ossau.uklinux.net> | 2009-09-23 21:35:13 +0100 |
| commit | 1bfae3ccf7589ffcd611a7d58102536d83e4ff68 (patch) | |
| tree | a5c8b762358d1aba611d0521a1a7c864f1c38181 | |
| parent | 7496b0397a6ff2877b9dc568d177d605e6ec24f0 (diff) | |
| download | guile-1bfae3ccf7589ffcd611a7d58102536d83e4ff68.tar.gz | |
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.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | libguile/extensions.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -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. */ |