Skip to content

Commit 48c5abb

Browse files
TimWollaTimWolla
committed
uri: Remove php_uri_parse() and php_uri_free()
This API is both less powerful as well as less efficient compared to just calling the `->parse_uri()` handler of the parser directly. With regard to efficiency it needlessly allocates 32 byte of memory to store two pointers, of which one is already known, because it's the input. While it would be possible to just return the resulting `uri_internal_t` struct (instead of a pointer to a freshly allocated one), which would be returned as a register pair, users of the API can also just create the struct themselves for even more flexibility in allocations. The API is also less powerful, because it does not support base URIs.
1 parent e2f3074 commit 48c5abb

File tree

4 files changed

+57
-69
lines changed

4 files changed

+57
-69
lines changed

‎ext/openssl/xp_ssl.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2640,14 +2640,19 @@ static char *php_openssl_get_url_name(const char *resourcename,
26402640
return NULL;
26412641
}
26422642

2643-
uri_internal_t *internal_uri = php_uri_parse(uri_parser, resourcename, resourcenamelen, true);
2644-
if (internal_uri == NULL) {
2643+
void *parsed = uri_parser->parse(resourcename, resourcenamelen,
2644+
/* base_url */ NULL, /* errors */ NULL, /* silent */ true);
2645+
if (parsed == NULL) {
26452646
return NULL;
26462647
}
2648+
uri_internal_t internal_uri = {
2649+
.parser = uri_parser,
2650+
.uri = parsed,
2651+
};
26472652

26482653
char * url_name = NULL;
26492654
zval host_zv;
2650-
zend_result result = php_uri_get_host(internal_uri, PHP_URI_COMPONENT_READ_MODE_RAW, &host_zv);
2655+
zend_result result = php_uri_get_host(&internal_uri, PHP_URI_COMPONENT_READ_MODE_RAW, &host_zv);
26512656
if (result == SUCCESS && Z_TYPE(host_zv) == IS_STRING) {
26522657
const char * host = Z_STRVAL(host_zv);
26532658
size_t len = Z_STRLEN(host_zv);
@@ -2662,7 +2667,7 @@ static char *php_openssl_get_url_name(const char *resourcename,
26622667
}
26632668
}
26642669

2665-
php_uri_free(internal_uri);
2670+
uri_parser->free(parsed);
26662671
zval_ptr_dtor(&host_zv);
26672672

26682673
return url_name;

‎ext/uri/php_uri.c‎

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,6 @@ PHPAPI const php_uri_parser *php_uri_get_parser(zend_string *uri_parser_name)
110110
return zend_hash_find_ptr(&uri_parsers, uri_parser_name);
111111
}
112112

113-
ZEND_ATTRIBUTE_NONNULL PHPAPI uri_internal_t *php_uri_parse(const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, bool silent)
114-
{
115-
void *parsed = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);
116-
117-
if (parsed == NULL) {
118-
return NULL;
119-
}
120-
121-
uri_internal_t *internal_uri = emalloc(sizeof(*internal_uri));
122-
internal_uri->parser = uri_parser;
123-
internal_uri->uri = parsed;
124-
125-
return internal_uri;
126-
}
127-
128113
ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_scheme(const uri_internal_t *internal_uri, php_uri_component_read_mode read_mode, zval *zv)
129114
{
130115
return internal_uri->parser->property_handler.scheme.read(internal_uri->uri, read_mode, zv);
@@ -165,96 +150,95 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const uri_interna
165150
return internal_uri->parser->property_handler.fragment.read(internal_uri->uri, read_mode, zv);
166151
}
167152

168-
ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(uri_internal_t *internal_uri)
169-
{
170-
internal_uri->parser->free(internal_uri->uri);
171-
internal_uri->uri = NULL;
172-
internal_uri->parser = NULL;
173-
efree(internal_uri);
174-
}
175-
176153
ZEND_ATTRIBUTE_NONNULL PHPAPI php_uri *php_uri_parse_to_struct(
177154
const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, php_uri_component_read_mode read_mode, bool silent
178155
) {
179-
uri_internal_t *uri_internal = php_uri_parse(uri_parser, uri_str, uri_str_len, silent);
180-
if (uri_internal == NULL) {
156+
void *parsed = uri_parser->parse(uri_str, uri_str_len,
157+
/* base_url */ NULL, /* errors */ NULL, silent);
158+
if (parsed == NULL) {
181159
return NULL;
182160
}
183161

162+
uri_internal_t uri_internal = {
163+
.parser = uri_parser,
164+
.uri = parsed,
165+
};
166+
184167
php_uri *uri = ecalloc(1, sizeof(*uri));
185168
zval tmp;
186169
zend_result result;
187170

188-
result = php_uri_get_scheme(uri_internal, read_mode, &tmp);
171+
result = php_uri_get_scheme(&uri_internal, read_mode, &tmp);
189172
if (result == FAILURE) {
190173
goto error;
191174
}
192175
if (Z_TYPE(tmp) == IS_STRING) {
193176
uri->scheme = Z_STR(tmp);
194177
}
195178

196-
result = php_uri_get_username(uri_internal, read_mode, &tmp);
179+
result = php_uri_get_username(&uri_internal, read_mode, &tmp);
197180
if (result == FAILURE) {
198181
goto error;
199182
}
200183
if (Z_TYPE(tmp) == IS_STRING) {
201184
uri->user = Z_STR(tmp);
202185
}
203186

204-
result = php_uri_get_password(uri_internal, read_mode, &tmp);
187+
result = php_uri_get_password(&uri_internal, read_mode, &tmp);
205188
if (result == FAILURE) {
206189
goto error;
207190
}
208191
if (Z_TYPE(tmp) == IS_STRING) {
209192
uri->password = Z_STR(tmp);
210193
}
211194

212-
result = php_uri_get_host(uri_internal, read_mode, &tmp);
195+
result = php_uri_get_host(&uri_internal, read_mode, &tmp);
213196
if (result == FAILURE) {
214197
goto error;
215198
}
216199
if (Z_TYPE(tmp) == IS_STRING) {
217200
uri->host = Z_STR(tmp);
218201
}
219202

220-
result = php_uri_get_port(uri_internal, read_mode, &tmp);
203+
result = php_uri_get_port(&uri_internal, read_mode, &tmp);
221204
if (result == FAILURE) {
222205
goto error;
223206
}
224207
if (Z_TYPE(tmp) == IS_LONG) {
225208
uri->port = Z_LVAL(tmp);
226209
}
227210

228-
result = php_uri_get_path(uri_internal, read_mode, &tmp);
211+
result = php_uri_get_path(&uri_internal, read_mode, &tmp);
229212
if (result == FAILURE) {
230213
goto error;
231214
}
232215
if (Z_TYPE(tmp) == IS_STRING) {
233216
uri->path = Z_STR(tmp);
234217
}
235218

236-
result = php_uri_get_query(uri_internal, read_mode, &tmp);
219+
result = php_uri_get_query(&uri_internal, read_mode, &tmp);
237220
if (result == FAILURE) {
238221
goto error;
239222
}
240223
if (Z_TYPE(tmp) == IS_STRING) {
241224
uri->query = Z_STR(tmp);
242225
}
243226

244-
result = php_uri_get_fragment(uri_internal, read_mode, &tmp);
227+
result = php_uri_get_fragment(&uri_internal, read_mode, &tmp);
245228
if (result == FAILURE) {
246229
goto error;
247230
}
248231
if (Z_TYPE(tmp) == IS_STRING) {
249232
uri->fragment = Z_STR(tmp);
250233
}
251234

252-
php_uri_free(uri_internal);
235+
uri_parser->free(parsed);
253236

254237
return uri;
255238

256239
error:
257-
php_uri_free(uri_internal);
240+
241+
uri_parser->free(parsed);
258242
php_uri_struct_free(uri);
259243

260244
return NULL;
@@ -351,7 +335,8 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2) PHPAPI void php_uri_instantiate_uri(
351335
base_url = internal_base_url->uri;
352336
}
353337

354-
void *uri = uri_parser->parse(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str), base_url, errors_zv != NULL ? &errors : NULL, !should_throw);
338+
void *uri = uri_parser->parse(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str),
339+
base_url, errors_zv != NULL ? &errors : NULL, !should_throw);
355340
if (UNEXPECTED(uri == NULL)) {
356341
if (should_throw) {
357342
zval_ptr_dtor(&errors);
@@ -853,7 +838,8 @@ static void uri_unserialize(INTERNAL_FUNCTION_PARAMETERS)
853838
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(object->ce->name));
854839
RETURN_THROWS();
855840
}
856-
internal_uri->uri = internal_uri->parser->parse(Z_STRVAL_P(uri_zv), Z_STRLEN_P(uri_zv), NULL, NULL, true);
841+
internal_uri->uri = internal_uri->parser->parse(Z_STRVAL_P(uri_zv), Z_STRLEN_P(uri_zv),
842+
/* base_url */ NULL, /* errors */ NULL, /* silent */ true);
857843
if (internal_uri->uri == NULL) {
858844
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(object->ce->name));
859845
RETURN_THROWS();

‎ext/uri/php_uri.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser);
4949
*/
5050
PHPAPI const php_uri_parser *php_uri_get_parser(zend_string *uri_parser_name);
5151

52-
ZEND_ATTRIBUTE_NONNULL PHPAPI uri_internal_t *php_uri_parse(const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, bool silent);
53-
5452
/**
5553
* Retrieves the scheme component based on the read_mode and passes it to the zv ZVAL in case of success.
5654
*
@@ -171,13 +169,6 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_query(const uri_internal_t
171169
*/
172170
ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const uri_internal_t *internal_uri, php_uri_component_read_mode read_mode, zval *zv);
173171

174-
/**
175-
* Frees the uri member within the provided internal URI.
176-
*
177-
* @param internal_uri The internal URI
178-
*/
179-
ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(uri_internal_t *internal_uri);
180-
181172
/**
182173
* Creates a new php_uri struct containing all the URI components. The components are retrieved based on the read_mode parameter.
183174
*

‎ext/zend_test/test.c‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -741,54 +741,60 @@ static ZEND_FUNCTION(zend_test_uri_parser)
741741
RETURN_THROWS();
742742
}
743743

744-
uri_internal_t *uri = php_uri_parse(parser, ZSTR_VAL(uri_string), ZSTR_LEN(uri_string), false);
745-
if (uri == NULL) {
744+
void *parsed = parser->parse(ZSTR_VAL(uri_string), ZSTR_LEN(uri_string),
745+
/* base_url */ NULL, /* errors */ NULL, /* silent */ false);
746+
if (parsed == NULL) {
746747
RETURN_THROWS();
747748
}
748749

750+
uri_internal_t uri = {
751+
.parser = parser,
752+
.uri = parsed,
753+
};
754+
749755
zval value;
750756

751757
array_init(return_value);
752758
zval normalized;
753759
array_init(&normalized);
754-
php_uri_get_scheme(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
760+
php_uri_get_scheme(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
755761
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_SCHEME), &value);
756-
php_uri_get_username(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
762+
php_uri_get_username(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
757763
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_USERNAME), &value);
758-
php_uri_get_password(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
764+
php_uri_get_password(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
759765
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PASSWORD), &value);
760-
php_uri_get_host(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
766+
php_uri_get_host(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
761767
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_HOST), &value);
762-
php_uri_get_port(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
768+
php_uri_get_port(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
763769
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PORT), &value);
764-
php_uri_get_path(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
770+
php_uri_get_path(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
765771
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PATH), &value);
766-
php_uri_get_query(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
772+
php_uri_get_query(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
767773
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_QUERY), &value);
768-
php_uri_get_fragment(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
774+
php_uri_get_fragment(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
769775
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_FRAGMENT), &value);
770776
zend_hash_str_add(Z_ARR_P(return_value), "normalized", strlen("normalized"), &normalized);
771777
zval raw;
772778
array_init(&raw);
773-
php_uri_get_scheme(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
779+
php_uri_get_scheme(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
774780
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_SCHEME), &value);
775-
php_uri_get_username(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
781+
php_uri_get_username(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
776782
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_USERNAME), &value);
777-
php_uri_get_password(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
783+
php_uri_get_password(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
778784
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PASSWORD), &value);
779-
php_uri_get_host(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
785+
php_uri_get_host(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
780786
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_HOST), &value);
781-
php_uri_get_port(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
787+
php_uri_get_port(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
782788
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PORT), &value);
783-
php_uri_get_path(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
789+
php_uri_get_path(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
784790
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PATH), &value);
785-
php_uri_get_query(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
791+
php_uri_get_query(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
786792
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_QUERY), &value);
787-
php_uri_get_fragment(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
793+
php_uri_get_fragment(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
788794
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_FRAGMENT), &value);
789795
zend_hash_str_add(Z_ARR_P(return_value), "raw", strlen("raw"), &raw);
790796

791-
php_uri_free(uri);
797+
parser->free(parsed);
792798
}
793799

794800
static bool has_opline(zend_execute_data *execute_data)

0 commit comments

Comments
 (0)