Changeset aa3ca1e in mainline

Timestamp:

2019-06-22T13:26:01Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

0d0f1a8

Parents:

f31ca47

Message:

adding tests if str_dup or callocs fail

Adding tests to ensure the stability of the code
according to the feedback. At multiple places
str_dup and callocs has been used without testing
if they returned NULL

File:

• uspace/app/bdsh/cmds/modules/alias/alias.c (modified) (3 diffs)

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

@@ -65 +65 @@
 }
 
-static void set_alias(const char *name, const char *value)
+static errno_t set_alias(const char *name, const char *value)
 {
         odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)name, NULL);
@@ -74 +74 @@
                 free(data->value);
                 data->value = str_dup(value);
+
+                if (data->value == NULL) {
+                        cli_error(CL_ENOMEM, "%s: failing to allocate memory for value\n", cmdname);
+                        return ENOMEM;
+                }
         } else {
                 /* add new value */
                 alias_t *data = (alias_t *)calloc(1, sizeof(alias_t));
+                if (data == NULL) {
+                        cli_error(CL_ENOMEM, "%s: failing to allocate memory for data container\n", cmdname);
+                        return ENOMEM;
+                }
+
                 data->name = str_dup(name);
+                if (data->name == NULL) {
+                        cli_error(CL_ENOMEM, "%s: failing to allocate memory for name\n", cmdname);
+                        free(data);
+                        return ENOMEM;
+                }
+
                 data->value = str_dup(value);
-
+                if (data->value == NULL) {
+                        cli_error(CL_ENOMEM, "%s: failing to allocate memory for value\n", cmdname);
+                        free(data->name);
+                        free(data);
+                        return ENOMEM;
+                }
                 odict_insert(&data->odict, &alias_dict, NULL);
         }
+
+        return EOK;
 }
 
@@ -131 +154 @@
         size_t i;
         for (i = 1; argv[i] != NULL; i++) {
-                char *name = str_dup(argv[i]);
+                char *name = argv[i];
                 char *value;
                 if ((value = str_chr(name, '=')) != NULL) {
                         name[value - name] = '\0';
+
                         if (!validate_name(name)) {
                                 cli_error(CL_EFAIL, "%s: invalid alias name given\n", cmdname);
-                                free(name);
                                 return CMD_FAILURE;
                         }
 
-                        set_alias(name, value + 1);
+                        if (set_alias(name, value + 1) != EOK) {
+                                return CMD_FAILURE;
+                        }
                 } else {
                         if (!print_alias(name)) {
-                                free(name);
                                 return CMD_FAILURE;
                         }
                 }
-
-                free(name);
         }