CR

Signed-off-by: Mateusz Front <[email protected]>

Author: mat-hek

libs/estdlib/src/os.erl

@@ -27,6 +27,6 @@
 %% @doc     Get an environment variable value if defined
 %% @end
 %%-----------------------------------------------------------------------------
--spec getenv(Name :: string()) -> string() | false.
+-spec getenv(Name :: nonempty_string()) -> nonempty_string() | false.
 getenv(_VarName) ->
     erlang:nif_error(undefined).

src/libAtomVM/nifs.c

@@ -1818,48 +1818,42 @@ static term nif_os_getenv_1(Context *ctx, int argc, term argv[])
     int ok;
     const char *env_var = interop_list_to_utf8_string(env_var_list, &ok);
     if (UNLIKELY(!ok)) {
-        RAISE_ERROR(OUT_OF_MEMORY_ATOM);
+        RAISE_ERROR(BADARG_ATOM);
     }
 
 #ifndef AVM_NO_SMP
     smp_spinlock_lock(&ctx->global->env_spinlock);
 #endif
 
-    const char *env_var_value_tmp = getenv(env_var);
-
-    if (IS_NULL_PTR(env_var_value_tmp)) {
-        result = FALSE_ATOM;
-        goto nif_os_getenv_1_unlock_return;
-    }
-
-    size_t env_value_len = strlen(env_var_value_tmp);
-    char *env_var_value = malloc(env_value_len + 1);
+    char *env_var_value = getenv(env_var);
 
-    if (UNLIKELY(IS_NULL_PTR(env_var_value))) {
-        result = OUT_OF_MEMORY_ATOM;
-        goto nif_os_getenv_1_unlock_return;
+    if (IS_NULL_PTR(env_var_value)) {
+#ifndef AVM_NO_SMP
+        smp_spinlock_unlock(&ctx->global->env_spinlock);
+#endif
+        return FALSE_ATOM;
     }
 
-    strcpy(env_var_value, env_var_value_tmp);
+    env_var_value = strdup(env_var_value);
 
 #ifndef AVM_NO_SMP
     smp_spinlock_unlock(&ctx->global->env_spinlock);
 #endif
 
+    if (UNLIKELY(IS_NULL_PTR(env_var_value))) {
+        RAISE_ERROR(OUT_OF_MEMORY_ATOM);
+    }
+
+    size_t env_value_len = strlen(env_var_value);
+
     if (UNLIKELY(memory_ensure_free_opt(ctx, LIST_SIZE(env_value_len, 1), MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+        free(env_var_value);
         RAISE_ERROR(OUT_OF_MEMORY_ATOM);
     }
 
     result = interop_bytes_to_list(env_var_value, env_value_len, &ctx->heap);
     free(env_var_value);
     return result;
-
-nif_os_getenv_1_unlock_return:
-#ifndef AVM_NO_SMP
-    smp_spinlock_unlock(&ctx->global->env_spinlock);
-#endif
-
-    return result;
 }
 
 static term nif_erlang_make_tuple_2(Context *ctx, int argc, term argv[])

tests/libs/estdlib/test_os.erl

@@ -29,12 +29,22 @@ test() ->
     ok.
 
 test_os_getenv() ->
-    true =
+    ok =
         case atomvm:platform() of
-            generic_unix ->
-                is_list(os:getenv("PATH"));
-            _ ->
-                true
+            generic_unix -> validate_path(os:getenv("PATH"));
+            _ -> ok
+        end,
+    false = os:getenv("NON_EXISTENT_VAR"),
+    false = os:getenv("ZAŻÓŁĆ_GĘŚLĄ_JAŹŃ"),
+    false = os:getenv(""),
+    ok =
+        try
+            os:getenv(not_a_string)
+        catch
+            error:badarg -> ok;
+            Class:Reason:Stacktrace -> erlang:raise(Class, Reason, Stacktrace)
         end,
-    false = os:getenv("NON_EXISTENT_PATH_VAR"),
     ok.
+
+validate_path("/" ++ _Rest) -> ok;
+validate_path(_String) -> error.