fix potentially missing NUL termination

smalyshev · smalyshev · commit 2b10db8e1010 · 2014-08-18T23:04:24.000-07:00
diff --git a/main/network.c b/main/network.c
@@ -989,6 +989,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
@@ -1013,6 +1014,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) {

Original file line number	Diff line number	Diff line change
`@@ -989,6 +989,7 @@ PHPAPI char php_socket_strerror(long err, char buf, size_t bufsize)`
`989`	`989`	`buf = estrdup(errstr);`
`990`	`990`	`} else {`
`991`	`991`	`strncpy(buf, errstr, bufsize);`
	`992`	`+ buf[bufsize?(bufsize-1):0] = 0;`
`992`	`993`	`}`
`993`	`994`	`return buf;`
`994`	`995`	`#else`
`@@ -1013,6 +1014,7 @@ PHPAPI char php_socket_strerror(long err, char buf, size_t bufsize)`
`1013`	`1014`	`buf = estrdup(sysbuf);`
`1014`	`1015`	`} else {`
`1015`	`1016`	`strncpy(buf, sysbuf, bufsize);`
	`1017`	`+ buf[bufsize?(bufsize-1):0] = 0;`
`1016`	`1018`	`}`
`1017`	`1019`
`1018`	`1020`	`if (free_it) {`