Merge branch 'ar/mingw-run-external-with-non-ascii-path'

[git/git.git] / compat / mingw.c

diff --git a/compat/mingw.c b/compat/mingw.c
index a417a3b..7a0d619 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1272,7 +1272,7 @@ static wchar_t *make_environment_block(char **deltaenv)
                }
 
                ALLOC_ARRAY(result, size);
                }
 
                ALLOC_ARRAY(result, size);

-               memcpy(result, wenv, size * sizeof(*wenv));
+               COPY_ARRAY(result, wenv, size);

                FreeEnvironmentStringsW(wenv);
                return result;
        }
                FreeEnvironmentStringsW(wenv);
                return result;
        }


@@ -1316,7 +1316,7 @@ static wchar_t *make_environment_block(char **deltaenv)
                        continue;
 
                size = wcslen(array[i]) + 1;
                        continue;
 
                size = wcslen(array[i]) + 1;

-               memcpy(p, array[i], size * sizeof(*p));
+               COPY_ARRAY(p, array[i], size);

                p += size;
        }
        *p = L'\0';
                p += size;
        }
        *p = L'\0';