Moved free(cp) to right after last (and only) use of cp. The statement

was flagged by gcc 6 -Wmisleading-indentation.  In its original location,
it would not always have been called, resulting in leaked memory.

(cherry picked from commit 79f012b76eba04d50a36a4a37c57458a8d521434)

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 3bc080856d02f663c51f0a765ed35afdce34c452..9a35a816ff15ddf3056d0a39d7a5a794bc529b6f 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -908,6 +908,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
            if (ontty != PITTY)
                SIGNAL (SIGINT, intrser);
            mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
            if (ontty != PITTY)
                SIGNAL (SIGINT, intrser);
            mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */

+            free (cp);

 
            for (ap = arglist_head; ap; ap = ap->a_next) {
                fmt_free(ap->a_fmt, 0);
 
            for (ap = arglist_head; ap; ap = ap->a_next) {
                fmt_free(ap->a_fmt, 0);


@@ -922,7 +923,6 @@ process (char *folder, char *fname, int ofilen, int ofilec)
                SIGNAL (SIGINT, SIG_IGN);
            if (mhl_action == NULL && fp != stdin && fp != NULL)
                fclose (fp);
                SIGNAL (SIGINT, SIG_IGN);
            if (mhl_action == NULL && fp != stdin && fp != NULL)
                fclose (fp);

-               free (cp);

            if (holder.c_text) {
                free (holder.c_text);
                holder.c_text = NULL;
            if (holder.c_text) {
                free (holder.c_text);
                holder.c_text = NULL;