Correct memory leak in add_dynlink_noinstall (CID #1504301, #1504306) (#4493)

The single check for either install_path or current_path being NULL
will leak if it passes; load_noinstall_path() doesn't have an explicit
return NULL and lt_malloc() exits if malloc() returns NULL, so
current_path is guaranteed non-NULL if load_noinstall_path() returns.
To avoid the issue, check install_path immediately after it's set.

(If coverity doesn't recognize that current_path will never be NULL,
it may need MEM().)

At the end of add_dynlink_noinstall(), both are freed.

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index 5555a95fb56cf2c269e3dda47c07486c1ced4b57..28c15cc5820595fcbd94e5f298c5ec5f064c0b39 100644 (file)
--- a/scripts/jlibtool.c
+++ b/scripts/jlibtool.c
@@ -1688,11 +1688,9 @@ static void add_dylink_noinstall(count_chars *cc, char const *arg, int pathlen,
        int i_p_len, c_p_len, name_len, dyext_len, cur_len;
 
        install_path = load_install_path(arg);
-       current_path = load_noinstall_path(arg, pathlen);
+       if (!install_path) return;
 
-       if (!install_path || !current_path) {
-               return;
-       }
+       current_path = load_noinstall_path(arg, pathlen);
 
        push_count_chars(cc, target->dynamic_link_no_install);
 
@@ -1725,6 +1723,8 @@ static void add_dylink_noinstall(count_chars *cc, char const *arg, int pathlen,
        cur_len += dyext_len;
 
        push_count_chars(cc, exp_argument);
+       lt_const_free(install_path);
+       lt_const_free(current_path);
 }
 
 /* use -L -llibname to allow to use installed libraries */