diff options
| author | Anatol Belski <ab@php.net> | 2016-08-29 21:13:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-29 21:13:39 +0200 |
| commit | 2004585d03bcc67467b736b22d9a746e7b2f8aab (patch) | |
| tree | 4ad7fde1d3fa51dd397837f7a3925b7aed19ac3d | |
| parent | 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe (diff) | |
| parent | d787b0ea13951e8653c903808b061bc859ff15fb (diff) | |
| download | php-git-2004585d03bcc67467b736b22d9a746e7b2f8aab.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
ensure null termination
| -rw-r--r-- | ext/curl/interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 7069710ece..e43ca31a90 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1893,8 +1893,9 @@ static void create_certinfo(struct curl_certinfo *ci, zval *listcode) int len; char s[64]; char *tmp; - strncpy(s, slist->data, 64); - tmp = memchr(s, ':', 64); + strncpy(s, slist->data, sizeof(s)); + s[sizeof(s)-1] = '\0'; + tmp = memchr(s, ':', sizeof(s)); if(tmp) { *tmp = '\0'; len = strlen(s); |