projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
3aba210
)
proper character escaping
author
Michael Wallner
<mike@php.net>
Fri, 17 Jan 2014 14:31:53 +0000
(15:31 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 17 Jan 2014 14:31:53 +0000
(15:31 +0100)
php_http_params.c
patch
|
blob
|
history
diff --git
a/php_http_params.c
b/php_http_params.c
index 4b02e8c925874345f5b369478e69e0d6382fe0b3..76d6909b6eeee83a10e5294dae3dcf6cd4415592 100644
(file)
--- a/
php_http_params.c
+++ b/
php_http_params.c
@@
-60,7
+60,7
@@
static inline void sanitize_escaped(zval *zv TSRMLS_DC)
ZVAL_STRINGL(zv, deq, deq_len, 0);
}
ZVAL_STRINGL(zv, deq, deq_len, 0);
}
- php_stripslashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv) TSRMLS_CC);
+ php_strip
c
slashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv) TSRMLS_CC);
}
static inline void prepare_escaped(zval *zv TSRMLS_DC)
}
static inline void prepare_escaped(zval *zv TSRMLS_DC)
@@
-68,9
+68,10
@@
static inline void prepare_escaped(zval *zv TSRMLS_DC)
if (Z_TYPE_P(zv) == IS_STRING) {
int len = Z_STRLEN_P(zv);
if (Z_TYPE_P(zv) == IS_STRING) {
int len = Z_STRLEN_P(zv);
- Z_STRVAL_P(zv) = php_addslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1 TSRMLS_CC);
+ Z_STRVAL_P(zv) = php_addcslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1,
+ ZEND_STRL("\0..\37\173\\\"") TSRMLS_CC);
- if (len != Z_STRLEN_P(zv)) {
+ if (len != Z_STRLEN_P(zv)
|| strpbrk(Z_STRVAL_P(zv), "()<>@,;:\"/[]?={} ")
) {
zval tmp = *zv;
int len = Z_STRLEN_P(zv) + 2;
char *str = emalloc(len + 1);
zval tmp = *zv;
int len = Z_STRLEN_P(zv) + 2;
char *str = emalloc(len + 1);