Add support for freeing a remap file datastructure, so we avoid a

memory leak.

tftpd/remap.c

@@ -239,6 +239,26 @@ struct rule *parserulefile(FILE *f)
   return first_rule;
 }
 
+/* Destroy a rule file data structure */
+void freerules(struct rule *r)
+{
+  struct rule *next;
+
+  while ( r ) {
+    next = r->next;
+
+    regfree(&r->rx);
+
+    /* "" patterns aren't allocated by malloc() */
+    if ( r->pattern && *r->pattern )
+      free(r->pattern);
+  
+    free(r);
+
+    r = next;
+  }
+}
+
 /* Execute a rule set on a string; returns a malloc'd new string. */
 char *rewrite_string(const char *input, const struct rule *rules, int is_put)
 {

tftpd/remap.h

@@ -30,6 +30,9 @@ struct rule;
 /* Read a rule file */
 struct rule *parserulefile(FILE *);
 
+/* Destroy a rule file data structure */
+void freerules(struct rule *);
+
 /* Execute a rule set on a string; returns a malloc'd new string. */
 char *rewrite_string(const char *, const struct rule *, int);
 

tftpd/tftpd.c

@@ -395,10 +395,10 @@ main(int argc, char **argv)
       caught_sighup = 0;
       if ( listen ) {
 #ifdef HAVE_REGEX
-	/* This is unfortunately a memory leak.  Hopefully
+	if ( rewrite_file ) {
-	   SIGHUPs aren't too common. */
+	  freerules(rewrite_rules);
-	if ( rewrite_file )
 	  rewrite_rules = read_remap_rules(rewrite_file);
+	}
 #endif
       } else {
 	/* Return to inetd for respawn */