mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 06:13:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

- prevent bad things to happen when invalid path are passed to MoveFileEx

Browse Source
This commit is contained in:
Pierre Joye 2010-01-27 01:18:43 +00:00
parent 573c33b3b7
commit 6925763347
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main/streams/plain_wrapper.c
View File

@ -38,6 +38,10 @@
#endif
#include "SAPI.h"
#ifdef PHP_WIN32
# include "ext/standard/php_string.h"
#endif
#include "php_streams_int.h"
#define php_stream_fopen_from_fd_int(fd, mode, persistent_id) _php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_CC TSRMLS_CC)
@ -1060,6 +1064,28 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, char *url_from, c
return 0;
}
#ifdef PHP_WIN32
/* Prevent bad things to happen when passing ' ' to MoveFileEx */
{
int url_from_len = strlen(url_from);
int url_to_len = strlen(url_to);
char *trimed = php_trim(url_from, url_from_len, NULL, 0, NULL, 1 TSRMLS_CC);
int trimed_len = strlen(trimed);
if (trimed_len == 0 || trimed_len != url_from_len) {
php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to TSRMLS_CC);
return 0;
}
trimed = php_trim(url_to, url_to_len, NULL, 0, NULL, 1 TSRMLS_CC);
trimed_len = strlen(trimed);
if (trimed_len == 0 || trimed_len != url_to_len) {
php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to TSRMLS_CC);
return 0;
}
}
#endif
if ((p = strstr(url_from, "://")) != NULL) {
url_from = p + 3;
}
@ -1076,7 +1102,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, char *url_from, c
if (php_check_open_basedir(url_from TSRMLS_CC) || php_check_open_basedir(url_to TSRMLS_CC)) {
return 0;
}
__debugbreak();
ret = VCWD_RENAME(url_from, url_to);
if (ret == -1) {