* libltdl/ltdl.c (argz_insert): Actually, BEFORE can be NULL

when *PARGZ_LEN is non-NULL, so the assertion to the contrary was
bogus.
Reported by Bob Friesenhahn <bfreisen@simple.dallas.tx.us>
and Albert Chin-A-Young <china@thewrittenword.com>

diff --git a/ChangeLog b/ChangeLog
index 51829768cd6a1eef6e84fce74bbd75efd397ab42..ee5044f06e630f3de18d367cc27be40bf355f4bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-23  Gary V. Vaughan  <gary@gnu.org>
+
+       * libltdl/ltdl.c (argz_insert): Actually, BEFORE can be NULL
+       when *PARGZ_LEN is non-NULL, so the assertion to the contrary was
+       bogus.
+       Reported by Bob Friesenhahn <bfreisen@simple.dallas.tx.us>
+       and Albert Chin-A-Young <china@thewrittenword.com>
+
 2002-06-21  Gary V. Vaughan  <gary@gnu.org>
 
        * libltdl/ltdl.c (foreach_dirinpath): Ensure that filename is '\0'

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 58e76ef17c7f17156e4f0c56d9bcc0b7fc2c0d1e..d8e3bc2a3249792b26ead762d5980f1faf9af82a 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -542,11 +542,6 @@ argz_insert (pargz, pargz_len, before, entry)
   assert (pargz_len);
   assert (entry && *entry);
 
-  /* Either PARGZ/PARGZ_LEN is empty and BEFORE is NULL,
-     or BEFORE points into an address within the ARGZ vector.  */
-  assert ((!*pargz && !*pargz_len && !before)
-         || ((*pargz <= before) && (before < (*pargz + *pargz_len))));
-
   /* No BEFORE address indicates ENTRY should be inserted after the
      current last element.  */
   if (!before)
@@ -2199,7 +2194,7 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
            goto cleanup;
        }
 
-       assert (filenamesize > lendir); 
+       assert (filenamesize > lendir);
        strcpy (filename, dir_name);
 
        if (base_name && *base_name)