From 252c0c916424a27fd46b9adabd5e8c154e8d1507 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sat, 18 Jan 2025 14:47:48 +0000 Subject: [PATCH] win32: switch handful of memmove over memcpy. (#17508) --- win32/ioutil.c | 4 ++-- win32/ioutil.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/win32/ioutil.c b/win32/ioutil.c index 9c313d6001be1..3231b92ffc5b0 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -316,7 +316,7 @@ PW32IO int php_win32_ioutil_mkdir_w(const wchar_t *path, mode_t mode) SET_ERRNO_FROM_WIN32_CODE(ERROR_NOT_ENOUGH_MEMORY); return -1; } - memmove(tmp, path, (path_len + 1) * sizeof(wchar_t)); + memcpy(tmp, path, (path_len + 1) * sizeof(wchar_t)); if (PHP_WIN32_IOUTIL_NORM_FAIL == php_win32_ioutil_normalize_path_w(&tmp, path_len, &path_len)) { free(tmp); @@ -331,7 +331,7 @@ PW32IO int php_win32_ioutil_mkdir_w(const wchar_t *path, mode_t mode) free(tmp); return -1; } - memmove(_tmp, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); + memcpy(_tmp, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); src = tmp; dst = _tmp + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; #ifndef ZTS diff --git a/win32/ioutil.h b/win32/ioutil.h index d8d7eacbba5b4..8b9ed491ffd99 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -220,11 +220,11 @@ zend_always_inline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in } if (PHP_WIN32_IOUTIL_IS_LONG_PATHW(mb, mb_len) || PHP_WIN32_IOUTIL_IS_JUNCTION_PATHW(mb, mb_len) || PHP_WIN32_IOUTIL_IS_UNC_PATHW(mb, mb_len)) { - memmove(ret, mb, mb_len * sizeof(wchar_t)); + memcpy(ret, mb, mb_len * sizeof(wchar_t)); ret[mb_len] = L'\0'; } else { wchar_t *src = mb, *dst = ret + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW; - memmove(ret, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); + memcpy(ret, PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW, PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW * sizeof(wchar_t)); #ifndef ZTS if (dir_len > 0) { size_t len = GetCurrentDirectoryW(dir_len, dst);