main: fix memory leak when creating a whiteout

giuseppe · giuseppe · commit 2b8dff330fda · 2020-06-29T13:54:22.000+02:00
Closes: #222 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
diff --git a/main.c b/main.c
@@ -166,6 +166,8 @@ static bool disable_ovl_whiteout;
 static uid_t overflow_uid;
 static gid_t overflow_gid;
 
+static struct ovl_ino dummy_ino;
+
 static double
 get_timeout (struct ovl_data *lo)
 {
@@ -747,7 +749,7 @@ node_free (void *p)
       n->parent = NULL;
     }
 
-  if (n->ino || n->node_lookups > 0)
+  if ((n->ino && n->ino != &dummy_ino) || n->node_lookups > 0)
     return;
 
   if (n->children)
@@ -1082,8 +1084,6 @@ node_set_name (struct ovl_node *node, char *name)
     node->name_hash = hash_string (name, SIZE_MAX);
 }
 
-static struct ovl_ino dummy_ino;
-
 static struct ovl_node *
 make_whiteout_node (const char *path, const char *name)
 {

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ static bool disable_ovl_whiteout;`
`166`	`166`	`static uid_t overflow_uid;`
`167`	`167`	`static gid_t overflow_gid;`
`168`	`168`
	`169`	`+static struct ovl_ino dummy_ino;`
	`170`	`+`
`169`	`171`	`static double`
`170`	`172`	`get_timeout (struct ovl_data *lo)`
`171`	`173`	`{`
`@@ -747,7 +749,7 @@ node_free (void *p)`
`747`	`749`	`n->parent = NULL;`
`748`	`750`	`}`
`749`	`751`
`750`		`- if (n->ino \|\| n->node_lookups > 0)`
	`752`	`+ if ((n->ino && n->ino != &dummy_ino) \|\| n->node_lookups > 0)`
`751`	`753`	`return;`
`752`	`754`
`753`	`755`	`if (n->children)`
`@@ -1082,8 +1084,6 @@ node_set_name (struct ovl_node node, char name)`
`1082`	`1084`	`node->name_hash = hash_string (name, SIZE_MAX);`
`1083`	`1085`	`}`
`1084`	`1086`
`1085`		`-static struct ovl_ino dummy_ino;`
`1086`		`-`
`1087`	`1087`	`static struct ovl_node *`
`1088`	`1088`	`make_whiteout_node (const char path, const char name)`
`1089`	`1089`	`{`