Changeset f90eb75 in mainline

Timestamp:

2011-08-21T13:24:21Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5935c079

Parents:

b48d046 (diff), 8a6ba94 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge another bdsh stack overflow fix

File:

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

uspace/app/bdsh/compl.c

@@ -98 +98 @@
         int retval;
         tokenizer_t tok;
-        token_t tokens[WORD_MAX];
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL) {
+                retval = ENOMEM;
+                goto error;
+        }
         int current_token;
         size_t tokens_length;
@@ -254 +258 @@
         if (cs != NULL)
                 free(cs);
+        if (tokens != NULL)
+                free(tokens);
 
         return retval;