[~] Fix new crash with unsetenv

toro-nicolas · toro-nicolas · commit e10c5ca5c8df · 2025-03-02T11:51:53.000+01:00
diff --git a/src/builtins/unsetenv.c b/src/builtins/unsetenv.c
@@ -44,6 +44,8 @@ static void search_and_delete(char **args, char **env, char **new_env)
         skip_variables(args, env, &index);
         new_env[index_new] = env[index];
         index_new++;
+        if (env[index] == NULL)
+            break;
     }
     new_env[index_new] = NULL;
 }
diff --git a/src/environnement.c b/src/environnement.c
@@ -67,7 +67,7 @@ void replace_env_var(char **env, char *name, char *value)
  */
 void check_path(mysh_t *mysh)
 {
-    char *path = get_env_var(mysh->env, "PATH");
+    char *path = my_malloc_strdup(get_env_var(mysh->env, "PATH"));
 
     if (path == NULL)
         add_variable(mysh, "path", "/usr/bin /bin");

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ static void search_and_delete(char args, char env, char **new_env)`
`44`	`44`	`skip_variables(args, env, &index);`
`45`	`45`	`new_env[index_new] = env[index];`
`46`	`46`	`index_new++;`
	`47`	`+ if (env[index] == NULL)`
	`48`	`+ break;`
`47`	`49`	`}`
`48`	`50`	`new_env[index_new] = NULL;`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void replace_env_var(char *env, char name, char *value)`
`67`	`67`	`*/`
`68`	`68`	`void check_path(mysh_t *mysh)`
`69`	`69`	`{`
`70`		`- char *path = get_env_var(mysh->env, "PATH");`
	`70`	`+ char *path = my_malloc_strdup(get_env_var(mysh->env, "PATH"));`
`71`	`71`
`72`	`72`	`if (path == NULL)`
`73`	`73`	`add_variable(mysh, "path", "/usr/bin /bin");`