summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-09-07 12:33:22 +0000
committerPierre Joye <pajoye@php.net>2011-09-07 12:33:22 +0000
commit59614b05c4add2e1888c83870b93fe0e257c09f6 (patch)
tree328181473f1b595ba56802e3fb88b3d26e61064f /Zend/zend_API.c
parent23ce7fe64131304323563a793fde097be64d1fb1 (diff)
downloadphp-git-59614b05c4add2e1888c83870b93fe0e257c09f6.tar.gz
- reject paths with trainling spaces using the very good new zend arg
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 5401483db7..c83b3d0f0e 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -438,6 +438,14 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const cha
if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
return "a valid path";
}
+#ifdef PHP_WIN32
+ if (c == 'p') {
+ /* do not allow trailing space (or single, */
+ if (Z_STRVAL_PP(arg)[0] == ' ' || Z_STRVAL_PP(arg)[Z_STRLEN_PP(arg) - 1] == ' ') {
+ return "a valid path";
+ }
+ }
+#endif
break;
case IS_OBJECT: