From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 4 Jun 2016 18:32:04 +0000 (-0700)
Subject: Fix sidebar check_sec.sh warnings.
X-Git-Tag: neomutt-20160709~13^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cee860eed53b66886fc740a05386c8f3cb72725;p=neomutt

Fix sidebar check_sec.sh warnings.

Use safe_malloc, FREE, and the safe_strcat functions.
---

diff --git a/sidebar.c b/sidebar.c
index aa2c91d72..6a44260ef 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -783,10 +783,12 @@ static void draw_sidebar (int first_row, int num_rows, int div_width)
         if (option (OPTSIDEBARSHORTPATH))
           tmp_folder_name += lastsep;  /* basename */
         sidebar_folder_name = malloc (strlen (tmp_folder_name) + sidebar_folder_depth*strlen (NONULL(SidebarIndentString)) + 1);
+                                 int sfn_len = strlen (tmp_folder_name) + sidebar_folder_depth*strlen (NONULL(SidebarIndentString)) + 1;
+        sidebar_folder_name = safe_malloc (sfn_len);
         sidebar_folder_name[0]=0;
         for (i=0; i < sidebar_folder_depth; i++)
-          strncat (sidebar_folder_name, NONULL(SidebarIndentString), strlen (NONULL(SidebarIndentString)));
-        strncat (sidebar_folder_name, tmp_folder_name, strlen (tmp_folder_name));
+          safe_strcat (sidebar_folder_name, sfn_len, NONULL(SidebarIndentString));
+        safe_strcat (sidebar_folder_name, sfn_len, tmp_folder_name);
       }
     }
     char str[STRING];