projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix for 7.3.0alpha4
[m6w6/ext-http]
/
src
/
php_http_params.c
diff --git
a/src/php_http_params.c
b/src/php_http_params.c
index 8988f43c65c0cd33dcd9ff7220304c0c4065d7bd..0cbfc7e81e92b02f00060077de27829c21b1cd2f 100644
(file)
--- a/
src/php_http_params.c
+++ b/
src/php_http_params.c
@@
-63,24
+63,30
@@
static inline void sanitize_escaped(zval *zv)
php_stripcslashes(Z_STR_P(zv));
}
php_stripcslashes(Z_STR_P(zv));
}
-static inline
void quote_string(zend_string *
*zs, zend_bool force)
+static inline
zend_string *quote_string(zend_string
*zs, zend_bool force)
{
{
-
int len = (*
zs)->len;
+
size_t len = (
zs)->len;
- *zs = php_addcslashes(*zs, 1, ZEND_STRL("\0..\37\173\\\""));
+#if PHP_VERSION_ID < 70300
+ zs = php_addcslashes(zs, 0, ZEND_STRL("\0..\37\173\\\""));
+#else
+ zs = php_addcslashes(zs, ZEND_STRL("\0..\37\173\\\""));
+#endif
- if (force || len != (
*zs)->len || strpbrk((*
zs)->val, "()<>@,;:\"[]?={} ")) {
- int len = (
*
zs)->len + 2;
+ if (force || len != (
zs)->len || strpbrk((
zs)->val, "()<>@,;:\"[]?={} ")) {
+ int len = (zs)->len + 2;
-
*zs = zend_string_extend(*
zs, len, 0);
+
zs = zend_string_extend(
zs, len, 0);
- memmove(&(
*zs)->val[1], (*zs)->val, (*
zs)->len);
- (
*
zs)->val[0] = '"';
- (
*
zs)->val[len-1] = '"';
- (
*
zs)->val[len] = '\0';
+ memmove(&(
zs)->val[1], (zs)->val, (
zs)->len);
+ (zs)->val[0] = '"';
+ (zs)->val[len-1] = '"';
+ (zs)->val[len] = '\0';
- zend_string_forget_hash_val(
*
zs);
+ zend_string_forget_hash_val(zs);
}
}
+
+ return zs;
}
/* if (Z_TYPE_P(zv) == IS_STRING) {
}
/* if (Z_TYPE_P(zv) == IS_STRING) {
@@
-109,7
+115,10
@@
static inline void quote_string(zend_string **zs, zend_bool force)
static inline void prepare_escaped(zval *zv)
{
if (Z_TYPE_P(zv) == IS_STRING) {
static inline void prepare_escaped(zval *zv)
{
if (Z_TYPE_P(zv) == IS_STRING) {
- quote_string(&Z_STR_P(zv), 0);
+ zend_string *str = quote_string(Z_STR_P(zv), 0);
+
+ zval_dtor(zv);
+ ZVAL_STR(zv, str);
} else {
zval_dtor(zv);
ZVAL_EMPTY_STRING(zv);
} else {
zval_dtor(zv);
ZVAL_EMPTY_STRING(zv);
@@
-118,7
+127,7
@@
static inline void prepare_escaped(zval *zv)
static inline void sanitize_urlencoded(zval *zv)
{
static inline void sanitize_urlencoded(zval *zv)
{
- Z_STRLEN_P(zv) = php_
raw_
url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+ Z_STRLEN_P(zv) = php_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
}
static inline void prepare_urlencoded(zval *zv)
}
static inline void prepare_urlencoded(zval *zv)
@@
-131,12
+140,11
@@
static inline void prepare_urlencoded(zval *zv)
static void sanitize_dimension(zval *zv)
{
static void sanitize_dimension(zval *zv)
{
- zval arr, tmp, *cur =
NULL
;
+ zval arr, tmp, *cur =
&arr
;
char *var = NULL, *ptr = Z_STRVAL_P(zv), *end = Z_STRVAL_P(zv) + Z_STRLEN_P(zv);
long level = 0;
array_init(&arr);
char *var = NULL, *ptr = Z_STRVAL_P(zv), *end = Z_STRVAL_P(zv) + Z_STRLEN_P(zv);
long level = 0;
array_init(&arr);
- cur = &arr;
while (ptr < end) {
if (!var) {
while (ptr < end) {
if (!var) {
@@
-195,8
+203,8
@@
static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf,
zval *val;
php_http_buffer_t prefix;
zval *val;
php_http_buffer_t prefix;
- if (!
ZEND_HASH_GET_APPLY_COUNT
(ht)) {
-
ZEND_HASH_INC_APPLY_COUNT
(ht);
+ if (!
HT_IS_RECURSIVE
(ht)) {
+
HT_PROTECT_RECURSION
(ht);
php_http_buffer_init(&prefix);
php_http_buffer_append(&prefix, keybuf->data, keybuf->used);
php_http_buffer_init(&prefix);
php_http_buffer_append(&prefix, keybuf->data, keybuf->used);
@@
-230,7
+238,7
@@
static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf,
php_http_buffer_cut(&prefix, keybuf->used, prefix.used - keybuf->used);
}
ZEND_HASH_FOREACH_END();
php_http_buffer_cut(&prefix, keybuf->used, prefix.used - keybuf->used);
}
ZEND_HASH_FOREACH_END();
-
ZEND_HASH_DEC_APPLY_COUNT
(ht);
+
HT_UNPROTECT_RECURSION
(ht);
php_http_buffer_dtor(&prefix);
}
php_http_buffer_dtor(&prefix);
}
@@
-489,7
+497,7
@@
static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
zval *test_ptr;
while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) {
zval *test_ptr;
while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) {
- if (Z_TYPE_P(test_ptr) == IS_ARRAY) {
+ if (Z_TYPE_P(test_ptr) == IS_ARRAY
&& Z_TYPE_P(ptr) == IS_ARRAY
) {
zval *tmp_ptr = ptr;
/* now find key in ptr */
zval *tmp_ptr = ptr;
/* now find key in ptr */
@@
-816,13
+824,14
@@
static inline void shift_rfc5988(php_http_buffer_t *buf, char *key_str, size_t k
static inline void shift_rfc5988_val(php_http_buffer_t *buf, zval *zv, const char *vss, size_t vsl, unsigned flags)
{
static inline void shift_rfc5988_val(php_http_buffer_t *buf, zval *zv, const char *vss, size_t vsl, unsigned flags)
{
- zend_string *zs = zval_get_string(zv);
-
- quote_string(&zs, 1);
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, zs->val, zs->len);
+ zend_string *str, *zs = zval_get_string(zv);
+ str = quote_string(zs, 1);
zend_string_release(zs);
zend_string_release(zs);
+
+ php_http_buffer_append(buf, vss, vsl);
+ php_http_buffer_append(buf, str->val, str->len);
+ zend_string_release(str);
}
static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags)
}
static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags)