Changeset 3e5c48c9 in mainline for uspace/app/bdsh/compl.c

Timestamp:

2011-07-13T20:44:04Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

159100a

Parents:

9be9c4d

Message:

Fix memory leak in shell completion.

File:

• uspace/app/bdsh/compl.c (modified) (5 diffs)

uspace/app/bdsh/compl.c

@@ -67 +67 @@
         /** Pointer inside list of directories */
         const char **path;
+        /** If not @c NULL, should be freed in the end. */
+        const char **path_list;
         /** Current open directory */
         DIR *dir;
@@ -163 +165 @@
                 }
                 *cstart += rpath_sep + 1 - prefix;
-//              printf("cstart=%zu\n", *cstart);
                 free(prefix);
 
-//              printf("\ncs->prefix='%s', dirname='%s'\n", cs->prefix, dirname);
-
-                static const char *dlist2[2];
-                dlist2[0] = dirname;
-                dlist2[1] = NULL;
-                cs->path = dlist2;
-                /* XXX dirname won't be freed */
+                cs->path_list = malloc(sizeof(char *) * 2);
+                if (cs->path_list == NULL) {
+                        retval = ENOMEM;
+                        goto error;
+                }
+                cs->path_list[0] = dirname;
+                cs->path_list[1] = NULL;
+                cs->path = cs->path_list;
+
         } else if (cs->is_command) {
                 /* Command without path */
@@ -193 +196 @@
         /* Error cleanup */
 
+        if (cs != NULL && cs->path_list != NULL) {
+                size_t i = 0;
+                while (cs->path_list[i] != NULL) {
+                        free(cs->path_list[i]);
+                        ++i;
+                }
+                free(cs->path_list);
+        }
+
         if (cs != NULL && cs->prefix != NULL)
                 free(cs->prefix);
@@ -271 +283 @@
 
                         /* If it was the last one, we are done */
-                        if (cs->dir == NULL) {
-                                cs->path = NULL;
+                        if (cs->dir == NULL)
                                 break;
-                        }
 
                         /* Read next directory entry */
@@ -322 +332 @@
         compl_t *cs = (compl_t *) state;
 
+        if (cs->path_list != NULL) {
+                size_t i = 0;
+                while (cs->path_list[i] != NULL) {
+                        free(cs->path_list[i]);
+                        ++i;
+                }
+                free(cs->path_list);
+        }
+
         if (cs->last_compl != NULL)
                 free(cs->last_compl);