X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url_api.h;h=a4c5df0b3690997c9f7a00dfcab08c25b56176c4;hp=dc0089909674861d236a78e59d42e45c1f74aa1d;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=8d980e09a008a1c223be1a068ab522750f8bbdad;ds=sidebyside diff --git a/php_http_url_api.h b/php_http_url_api.h index dc00899..a4c5df0 100644 --- a/php_http_url_api.h +++ b/php_http_url_api.h @@ -49,35 +49,35 @@ static inline php_url *_array2url(HashTable *ht TSRMLS_DC) zval **e; php_url *url = ecalloc(1, sizeof(php_url)); - if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->scheme = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->user = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->pass = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->host = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->path = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->query = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if ((SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void **) &e)) + if ((SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { url->fragment = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); } - if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void **) &e)) { + if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) { if (Z_TYPE_PP(e) == IS_LONG) { url->port = (unsigned short) Z_LVAL_PP(e); } else {