Changeset e62f8e3 in mainline

Timestamp:

2019-06-23T17:43:50Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

46288ee

Parents:

0d0f1a8

Message:

Adding a maximal loop counter for nested aliases

This commit was requested by a a reviewer. The old
version allowed to have endless nested aliases. This
commit changes this allowing only 20 nested aliases.

Location:

uspace/app/bdsh

Files:

• config.h (modified) (1 diff)
• input.c (modified) (5 diffs)

uspace/app/bdsh/config.h

@@ -42 +42 @@
 #endif
 
+/* define maximal nested aliases */
+#ifndef HUBS_MAX
+#define HUBS_MAX 20
+#endif
+
 /* Used in many places */
 #define SMALL_BUFLEN 256

uspace/app/bdsh/input.c

@@ -86 +86 @@
  * the handler
  */
-static errno_t process_input_nohup(cliuser_t *usr, list_t *alias_hups)
-{
+static errno_t process_input_nohup(cliuser_t *usr, list_t *alias_hups, size_t count_executed_hups)
+{
+        if (count_executed_hups >= HUBS_MAX) {
+                cli_error(CL_EFAIL, "%s: maximal alias hubs reached\n", PACKAGE_NAME);
+                return ELIMIT;
+        }
+
         token_t *tokens_buf = calloc(WORD_MAX, sizeof(token_t));
         if (tokens_buf == NULL)
@@ -197 +202 @@
                 if (!find_alias_hup(data, alias_hups)) {
                         alias_hup_t *hup = (alias_hup_t *)calloc(1, sizeof(alias_hup_t));
+                        if (hup == NULL) {
+                                cli_error(CL_EFAIL, "%s: cannot allocate alias structure\n", PACKAGE_NAME);
+                                rc = ENOMEM;
+                                goto finit;
+                        }
+
                         hup->alias = data;
                         list_append(&hup->alias_hup_link, alias_hups);
@@ -202 +213 @@
                         char *oldLine = usr->line;
                         const size_t input_length = str_size(usr->line) - str_size(cmd[0]) + str_size(data->value) + 1;
-                        usr->line = (char *)malloc(input_length * sizeof(char));
+                        usr->line = (char *)malloc(input_length);
+                        if (usr->line == NULL) {
+                                cli_error(CL_EFAIL, "%s: cannot allocate input structure\n", PACKAGE_NAME);
+                                rc = ENOMEM;
+                                goto finit;
+                        }
+
                         usr->line[0] = '\0';
 
@@ -222 +239 @@
 
                         /* reprocess input after string replace */
-                        rc = process_input_nohup(usr, alias_hups);
+                        rc = process_input_nohup(usr, alias_hups, count_executed_hups + 1);
                         usr->line = oldLine;
                         goto finit;
@@ -287 +304 @@
         list_initialize(&alias_hups);
 
-        errno_t rc = process_input_nohup(usr, &alias_hups);
+        errno_t rc = process_input_nohup(usr, &alias_hups, 0);
 
         list_foreach_safe(alias_hups, cur_link, next_link) {