Trap memory failures

nigelhorne · Dec 27, 2024 · 00cea44 · 00cea44
1 parent 7ff1870
commit 00cea44
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/sniff2ban.c b/sniff2ban.c
@@ -2548,9 +2548,9 @@ setup_apache_hosts(void)
 				tail = tail->next;
 			}
 			if(tail == NULL)
-				fputs("Memory allocation failure\n", stderr);
 				fclose(fin);
 				closedir(dirp);
+				fputs("Memory allocation failure\n", stderr);
 				return;
 			}
 
@@ -2560,6 +2560,13 @@ setup_apache_hosts(void)
 			if(verbose >= 3)
 				printf("Adding apache hostname %s\n", p);
 			tail->name = strdup(p);
+			if(tail->name == NULL) {
+				free(tail);
+				fclose(fin);
+				closedir(dirp);
+				fputs("Memory allocation failure\n", stderr);
+				return;
+			}
 			tail->next = NULL;
 		}
 		fclose(fin);