* libltdl/ltdl.c (trim): Return error rather than do bogus

null pointer arithmetic when parsing a malformed .la file.

diff --git a/ChangeLog b/ChangeLog
index 485b572b545d805cf9812509fed0fc98344182ea..8ef7596cb6cb65d4005faeca1e6dfbebadd4ffc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/ltdl.c (trim): Return error rather than do bogus
+       null pointer arithmetic when parsing a malformed .la file.
+
 2004-12-13  Albert Chin-A-Young  <china@thewrittenword.com>
 
        * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG,

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index cd99acceb8a83733717daeb1d3edcddb2552db67..c89690c02101b8da907e030c740a29f3d6586e90 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -2997,6 +2997,9 @@ trim (dest, str)
 
   LT_DLFREE (*dest);
 
+  if (!end)
+    return 1;
+
   if (len > 3 && str[0] == '\'')
     {
       tmp = LT_EMALLOC (char, end - str);