diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 12:56:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 12:56:29 +0200 |
| commit | 40912abf1d8203cc7899888713594f54a82cf004 (patch) | |
| tree | 85c6068e4b67da4e185f69ee9822663e0005d897 /main/network.c | |
| parent | 168ea67b2d8f44ec29b6aa725ad768d190ddd0d8 (diff) | |
| parent | 0e8c20edc90947f53f6495db7a18e1cd0fc4a8a5 (diff) | |
| download | php-git-40912abf1d8203cc7899888713594f54a82cf004.tar.gz | |
Merge remote-tracking branch 'php/master'
Conflicts:
ext/xsl/xsltprocessor.c
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/network.c b/main/network.c index 14db63a21b..5edc74c830 100644 --- a/main/network.c +++ b/main/network.c @@ -1006,6 +1006,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize) buf = estrdup(errstr); } else { strncpy(buf, errstr, bufsize); + buf[bufsize?(bufsize-1):0] = 0; } return buf; #else @@ -1030,6 +1031,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize) buf = estrdup(sysbuf); } else { strncpy(buf, sysbuf, bufsize); + buf[bufsize?(bufsize-1):0] = 0; } if (free_it) { |