From 0360aff8e87f3eb8e708842e52dba9396f3627e3 Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Wed, 12 Jun 2019 21:37:23 +0100
Subject: [PATCH] wmail: use realloc(3) and handle allocation failures.

---
 wmail/src/config.c | 18 ++++++++++--------
 wmail/src/wmail.c  |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/wmail/src/config.c b/wmail/src/config.c
index 692a035..aa865ab 100644
--- a/wmail/src/config.c
+++ b/wmail/src/config.c
@@ -139,9 +139,9 @@ static bool Tokenize( const char *line, const char **id, const char **value )
     return false;
 }
 
-static void AddSenderToSkipList( char *sender  )
+static void AddSenderToSkipList( char *sender )
 {
-    int numNames, i;
+    size_t numNames;
     char **skipName, **newList;
 
     for( skipName = config.skipNames, numNames = 0;
@@ -154,15 +154,17 @@ static void AddSenderToSkipList( char *sender  )
     }
 
     TRACE( "adding \"%s\" to skip-list of currently %d names\n", sender, numNames );
-    newList = malloc( sizeof(char *) * (numNames + 2) );
+    newList = realloc( config.skipNames, sizeof *config.skipNames * (numNames + 2) );
 
-    for( i = 0; i < numNames; ++i )
-	newList[i] = config.skipNames[i];
+    if( newList == NULL )
+    {
+	WARNING( "Cannot allocate memory for skip list.\n");
+	return;
+    }
 
-    newList[i] = sender;
-    newList[i+1] = NULL;
-    free( config.skipNames );
     config.skipNames = newList;
+    config.skipNames[numNames++] = sender;
+    config.skipNames[numNames++] = NULL;
 }
 
 void ResetConfigStrings( void )
diff --git a/wmail/src/wmail.c b/wmail/src/wmail.c
index 9a579c8..7f86634 100644
--- a/wmail/src/wmail.c
+++ b/wmail/src/wmail.c
@@ -1252,8 +1252,8 @@ static bool SkipSender( char *address )
     size_t len = strlen( address );
 
     // remove trailing '\n' got from fgets
-    if( address[len-1] == '\n' )
-	address[len-1] = '\0';
+    if( address[len - 1] == '\n' )
+	address[len - 1] = '\0';
 
     for( skipName = config.skipNames;
 	 skipName != NULL && *skipName != NULL; skipName++ )
-- 
2.11.4.GIT