[PATCH] ntdll: Complete error case in get_initial_environment

[Gerald Pfeifer]

GCC 12 (rightfully) would warn
dlls/ntdll/unix/env.c:1910:12: warning: 'env_pos' may be used uninitialized

Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com>
---
 dlls/ntdll/unix/env.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index 105038a34cb..cbbfb99f4b3 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -920,7 +920,11 @@ static WCHAR *get_initial_environment( SIZE_T *pos, SIZE_T *size )
     *size = 1;
     for (e = main_envp; *e; e++) *size += strlen(*e) + 1;
 
-    if (!(env = malloc( *size * sizeof(WCHAR) ))) return NULL;
+    if (!(env = malloc( *size * sizeof(WCHAR) )))
+    {
+        *pos = 0;
+        return NULL;
+    }
     ptr = env;
     end = env + *size - 1;
     for (e = main_envp; *e && ptr < end; e++)
-- 
2.34.1

[Esme Povirk (any/all)]

Patches are no longer picked up from wine-devel. You'll need to create
a merge request at https://gitlab.winehq.org/. See
https://wiki.winehq.org/Submitting_Patches for more detailed
instructions.

--
https://my.pronouns.page/are/any



On Mon, Sep 5, 2022 at 2:06 AM Gerald Pfeifer <gerald(a)pfeifer.com> wrote:
> GCC 12 (rightfully) would warn
> dlls/ntdll/unix/env.c:1910:12: warning: 'env_pos' may be used uninitialized
>
> Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com>
> ---
>  dlls/ntdll/unix/env.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
> index 105038a34cb..cbbfb99f4b3 100644
> --- a/dlls/ntdll/unix/env.c
> +++ b/dlls/ntdll/unix/env.c
> @@ -920,7 +920,11 @@ static WCHAR *get_initial_environment( SIZE_T *pos, SIZE_T *size )
>      *size = 1;
>      for (e = main_envp; *e; e++) *size += strlen(*e) + 1;
>
> -    if (!(env = malloc( *size * sizeof(WCHAR) ))) return NULL;
> +    if (!(env = malloc( *size * sizeof(WCHAR) )))
> +    {
> +        *pos = 0;
> +        return NULL;
> +    }
>      ptr = env;
>      end = env + *size - 1;
>      for (e = main_envp; *e && ptr < end; e++)
> --
> 2.34.1