From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 23 Jun 2002 21:35:58 +0000 (+0000)
Subject: * libltdl/ltdl.c (argz_insert): Actually, BEFORE can be NULL
X-Git-Tag: release-1-5~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6eb30bff05c45b56f8dead7fa7b995e793190b7;p=thirdparty%2Flibtool.git

* 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 6dcfce2bc..ab932581d 100644
--- 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 41e6ee3e3..57fb5af87 100644
--- 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)