mirror of
https://github.com/php/php-src.git
synced 2025-01-22 11:44:09 +08:00
MFH
This commit is contained in:
parent
46a6bd7f9d
commit
fdfa403388
@ -425,7 +425,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
|
||||
buf = nbuf;
|
||||
}
|
||||
/* stick that last bit of string on our output */
|
||||
strcat(buf, &string[pos]);
|
||||
strlcat(buf, &string[pos], buf_len);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1600,11 +1600,12 @@ PHP_FUNCTION(socket_set_option)
|
||||
{
|
||||
zval *arg1, **arg4;
|
||||
struct linger lv;
|
||||
struct timeval tv;
|
||||
php_socket *php_sock;
|
||||
int ov, optlen, retval;
|
||||
#ifdef PHP_WIN32
|
||||
int timeout;
|
||||
#else
|
||||
struct timeval tv;
|
||||
#endif
|
||||
long level, optname;
|
||||
void *opt_ptr;
|
||||
|
@ -425,7 +425,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
|
||||
buf = nbuf;
|
||||
}
|
||||
/* stick that last bit of string on our output */
|
||||
strcat(buf, &string[pos]);
|
||||
strlcat(buf, &string[pos], buf_len);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user