From: Gary V. Vaughan Date: Sun, 23 Jun 2002 21:47:20 +0000 (+0000) Subject: * libltdl/ltdl.c (argz_insert): Actually, BEFORE can be NULL X-Git-Tag: release-1-4-3~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=349fb8bc5b1151cf4a447e01621dd7ca334a1076;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 and Albert Chin-A-Young --- diff --git a/ChangeLog b/ChangeLog index 51829768c..ee5044f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-06-23 Gary V. Vaughan + + * 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 + and Albert Chin-A-Young + 2002-06-21 Gary V. Vaughan * libltdl/ltdl.c (foreach_dirinpath): Ensure that filename is '\0' diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 58e76ef17..d8e3bc2a3 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) @@ -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)