From 948e6bbecd55a6388297d8f0a85396e02888ab09 Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Sun, 21 Feb 2010 16:56:44 -0500 Subject: [PATCH] Guard against strerror()==NULL * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src:main): Check return value of strerror() using nonnull(). (func_emit_cwrapperexe_src:find_executable): Ditto. (func_emit_cwrapperexe_src:chase_symlinks): Ditto. --- ChangeLog | 8 ++++++++ libltdl/config/ltmain.m4sh | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d8ced9d7..295123ac1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-02-21 Charles Wilson + + Guard against strerror()==NULL + * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src:main): + Check return value of strerror() using nonnull(). + (func_emit_cwrapperexe_src:find_executable): Ditto. + (func_emit_cwrapperexe_src:chase_symlinks): Ditto. + 2010-02-21 Charles Wilson Document wrapper changes. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 043d9809f..56b74977f 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -3192,7 +3192,7 @@ EOF /* failed to start process */ lt_debugprintf (__FILE__, __LINE__, "(main) failed to launch target \"%s\": %s\n", - lt_argv_zero, strerror (errno)); + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3348,7 +3348,7 @@ find_executable (const char *wrapper) /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - strerror (errno)); + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3373,7 +3373,8 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", strerror (errno)); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3425,7 +3426,7 @@ chase_symlinks (const char *pathspec) { lt_fatal (__FILE__, __LINE__, "error accessing file \"%s\": %s", - tmp_pathspec, strerror (errno)); + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); -- 2.47.2