mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 13:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace strncat in filter implementation

Browse Source 
In this case we already know exactly where we need to write, no
need to use strncat at all.
This commit is contained in:
Nikita Popov 2019-08-23 15:51:57 +02:00
parent 9173c21a35
commit 724a4662b8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/standard/user_filters.c
View File

@ -292,8 +292,9 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
memcpy(wildcard, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
*period = '\0';
strncat(wildcard, ".*", 2);
ZEND_ASSERT(period[0] == '.');
period[1] = '*';
period[2] = '\0';
if (NULL != (fdat = zend_hash_str_find_ptr(BG(user_filter_map), wildcard, strlen(wildcard)))) {
period = NULL;
} else {

5
main/streams/filter.c
View File

@ -239,8 +239,9 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval
memcpy(wildname, filtername, n+1);
period = wildname + (period - filtername);
while (period && !filter) {
*period = '\0';
strncat(wildname, ".*", 2);
ZEND_ASSERT(period[0] == '.');
period[1] = '*';
period[2] = '\0';
if (NULL != (factory = zend_hash_str_find_ptr(filter_hash, wildname, strlen(wildname)))) {
filter = factory->create_filter(filtername, filterparams, persistent);
}