Changeset 46288ee in mainline for uspace/app/bdsh/cmds/modules/alias/alias.c

Timestamp:

2019-06-26T17:51:50Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

b781cc49

Parents:

e62f8e3

Message:

Improvement alias/unlias according to feedback

This commit will change the behaviour of unalias
when a not existing aliasname is given. The command
will newly return CMD_FAILURE and print a failure message.
Existings aliases will be deleted.

When updating an existing alias with the command alias,
then the old data structure will only be freed when
str_dup did not fail. This will prevent the data
of being corrupted in case of a memory failure.

File:

• uspace/app/bdsh/cmds/modules/alias/alias.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/alias/alias.c

@@ -72 +72 @@
                 /* update existing value */
                 alias_t *data = odict_get_instance(alias_link, alias_t, odict);
-                free(data->value);
-                data->value = str_dup(value);
+                char *dup_value = str_dup(value);
 
-                if (data->value == NULL) {
+                if (dup_value == NULL) {
                         cli_error(CL_ENOMEM, "%s: failing to allocate memory for value\n", cmdname);
                         return ENOMEM;
                 }
+
+                free(data->value);
+                data->value = dup_value;
         } else {
                 /* add new value */