Index: uspace/app/bdsh/compl.c
===================================================================
--- uspace/app/bdsh/compl.c	(revision bf9cb2ff74be98b6ea519f4cd121a9fe9ff54ebc)
+++ uspace/app/bdsh/compl.c	(revision 10ef47ba87b0150e1ceacded778cc98a29ea9421)
@@ -209,4 +209,5 @@
 		*cstart += rpath_sep + 1 - prefix;
 		free(prefix);
+		prefix = NULL;
 
 		cs->path_list = malloc(sizeof(char *) * 2);
@@ -252,14 +253,19 @@
 	}
 
-	if (cs != NULL && cs->prefix != NULL)
+	if ((cs != NULL) && (cs->prefix != NULL))
 		free(cs->prefix);
+	
 	if (dirname != NULL)
 		free(dirname);
+	
 	if (prefix != NULL)
 		free(prefix);
+	
 	if (stext != NULL)
 		free(stext);
+	
 	if (cs != NULL)
 		free(cs);
+	
 	if (tokens != NULL)
 		free(tokens);