Browse Source

Avoid multiple wcslen() calls

pull/3131/merge
Anatol Belski 9 years ago
parent
commit
34833c9d39
  1. 13
      win32/ioutil.h

13
win32/ioutil.h

@ -424,11 +424,14 @@ __forceinline static int php_win32_ioutil_rename(const char *oldnamea, const cha
free(oldnamew);
SET_ERRNO_FROM_WIN32_CODE(ERROR_INVALID_PARAMETER);
return -1;
} else if (!PHP_WIN32_IOUTIL_PATH_IS_OK_W(newnamew, wcslen(newnamew))) {
free(oldnamew);
free(newnamew);
SET_ERRNO_FROM_WIN32_CODE(ERROR_ACCESS_DENIED);
return -1;
} else {
size_t newnamew_len = wcslen(newnamew);
if (!PHP_WIN32_IOUTIL_PATH_IS_OK_W(newnamew, newnamew_len)) {
free(oldnamew);
free(newnamew);
SET_ERRNO_FROM_WIN32_CODE(ERROR_ACCESS_DENIED);
return -1;
}
}
ret = php_win32_ioutil_rename_w(oldnamew, newnamew);

Loading…
Cancel
Save