com php-src: ensure null termination: ext/curl/interface.c
| From: | Anatol Belski | Date: | Mon, 29 Aug 2016 19:03:03 +0000 |
| Subject: | com php-src: ensure null termination: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94131@lists.php.net to get a copy of this message | ||
Commit: d787b0ea13951e8653c903808b061bc859ff15fb
Author: Anatol Belski <ab@php.net> Mon, 29 Aug 2016 21:03:03 +0200
Parents: 295303b59059536079caf68b4d76acf2149bd42c
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d787b0ea13951e8653c903808b061bc859ff15fb
Log:
ensure null termination
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 062f996..02fbec7 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1851,8 +1851,9 @@ static void create_certinfo(struct curl_certinfo *ci, zval *listcode
TSRMLS_DC)
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);