From: Dave Brolley Date: Sun, 28 Jan 2007 14:55:01 +0000 (+0000) Subject: * libltdl/ltdl.c (lt_dlexit): Make sure that 'cur' is not NULL X-Git-Tag: release-2-1b~216 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa7deb3401b07b8d67b30547349747d02f9f6ac;p=thirdparty%2Flibtool.git * libltdl/ltdl.c (lt_dlexit): Make sure that 'cur' is not NULL before checking that it is still in the list. * tests/lt_dlexit.at: New test. * Makefile.am (TESTSUITE_AT): Adjust. (check-local): Also depend on libltdl/libltdlc.la. (check-recursive): Removed, unnecessary use of Automake internals. --- diff --git a/ChangeLog b/ChangeLog index 612370670..96f8c0bdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-01-28 Dave Brolley , + Ralf Wildenhues + + * libltdl/ltdl.c (lt_dlexit): Make sure that 'cur' is not NULL + before checking that it is still in the list. + * tests/lt_dlexit.at: New test. + * Makefile.am (TESTSUITE_AT): Adjust. + (check-local): Also depend on libltdl/libltdlc.la. + (check-recursive): Removed, unnecessary use of Automake + internals. + 2007-01-28 Mike Frysinger * libltdl/config/ltmain.m4sh (func_mode_link): Pass through diff --git a/Makefile.am b/Makefile.am index e8056f7a8..8ef8decc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -411,6 +411,7 @@ TESTSUITE_AT = tests/testsuite.at \ tests/search-path.at \ tests/old-m4-iface.at \ tests/am-subdir.at \ + tests/lt_dlexit.at \ tests/standalone.at \ tests/subproject.at \ tests/nonrecursive.at \ @@ -444,8 +445,6 @@ INSTALLCHECK_ENVIRONMENT = \ LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \ tst_aclocaldir="$(aclocaldir)" -check-recursive: $(srcdir)/$(TESTSUITE) - # Use `$(srcdir)' for the benefit of non-GNU makes: this is # how `testsuite' appears in our dependencies. $(srcdir)/$(TESTSUITE): $(srcdir)/tests/package.m4 $(TESTSUITE_AT) Makefile.am @@ -471,7 +470,7 @@ DISTCLEANFILES += tests/atconfig CD_TESTDIR = abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests # Hook the test suite into the check rule -check-local: tests/atconfig $(srcdir)/$(TESTSUITE) +check-local: tests/atconfig $(srcdir)/$(TESTSUITE) libltdl/libltdlc.la $(CD_TESTDIR); \ CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \ $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 1cf608573..92f995728 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -283,6 +283,18 @@ lt_dlexit (void) { ++errors; } + /* Make sure that the handle pointed to by 'cur' still exists. + lt_dlclose recursively closes dependent libraries which removes + them from the linked list. One of these might be the one + pointed to by 'cur'. */ + if (cur) + { + for (tmp = handles; tmp; tmp = tmp->next) + if (tmp == cur) + break; + if (! tmp) + cur = handles; + } } } } diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at new file mode 100644 index 000000000..1450159e3 --- /dev/null +++ b/tests/lt_dlexit.at @@ -0,0 +1,137 @@ +# Hand crafted tests for GNU Libtool. -*- Autotest -*- +# Copyright 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Test libltdl functionality. +# Try to keep the new interfaces of HEAD separate from those of +# branch-1-5 to facilitate testing of older releases. + +AT_BANNER([Libltdl functionality.]) + +AT_SETUP([lt_dlexit unloading libs]) +AT_KEYWORDS([libltdl]) + +# Test for +# http://lists.gnu.org/archive/html/bug-libtool/2007-01/msg00014.html + +AT_DATA([main.c], +[[#include +#include +#include + +typedef int (*pfun_T) (int); +typedef int *pvar_T; + +/* lt_dlopen wrapper */ +static lt_dlhandle +xdlopen (const char *filename) +{ + lt_dlhandle handle = lt_dlopen (filename); + if (!handle) { + fprintf (stderr, "can't open the module %s!\n", filename); + fprintf (stderr, "error was: %s\n", lt_dlerror()); + } + return handle; +} + +/* lt_dlsym wrapper: try one function and one variable */ +static int +xdlsymtest (lt_dlhandle handle, const char *func, const char *var) +{ + pfun_T pf = lt_dlsym (handle, func); + pvar_T pv = lt_dlsym (handle, var); + if (pf == NULL) { + fprintf (stderr, "function `%s' not found\n", func); + return 1; + } + if (pv == NULL) { + fprintf (stderr, "variable `%s' not found\n", var); + return 1; + } + return (*pf) (*pv); +} + +static int +callback (const char *filename, void *data) +{ + printf ("%s: %s\n", (char *)data, filename); + return 0; +} + +static int +try_iterate (const char *search_path) +{ + char *s = "try_iterate"; + return lt_dlforeachfile (search_path, callback, s); +} + +int +main (int argc, char **argv) +{ + int i; + lt_dlhandle b1; + + /* LTDL_SET_PRELOADED_SYMBOLS(); */ + if (lt_dlinit() != 0) { + fprintf (stderr, "error during initialization: %s\n", lt_dlerror()); + return 1; + } + if (!(b1 = xdlopen ("modb1.la"))) return 1; + if (xdlsymtest (b1, "fb1", "vb1")) return 1; + /* do not lt_dlclose here on purpose. */ + + if (lt_dlexit() != 0) { + fprintf (stderr, "error during exit: %s\n", lt_dlerror()); + return 1; + } + return 0; +} +]]) + + +AT_DATA([a1.c], +[[int f1 (int x) { return x - 1; } +int v1 = 1; +]]) + +AT_DATA([b1.c], +[[extern int f1 (int), v1; +int fb1 (int x) { return f1 (v1) + x - 3; } +int vb1 = 3; +]]) + +: ${LTDLINCL="-I$top_srcdir/libltdl"} +: ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} + +CPPFLAGS="$CPPFLAGS $LTDLINCL" +LDFLAGS="$LDFLAGS -no-undefined" + +for file in a1 b1 main; do + $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c $file.c +done +AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \ + -rpath /foo -avoid-version], [], [ignore], [ignore]) +AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \ + -rpath /foo -module -avoid-version liba1.la], [], [ignore], [ignore]) + +for dlopen in -dlopen -dlpreopen; do + AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ + $dlopen modb1.la $LIBLTDL], [], [ignore], [ignore]) + LT_AT_EXEC_CHECK([./main]) +done + +AT_CLEANUP