Merge branch 'PHP-7.3' into PHP-7.4

George Wang · George Wang · commit 1b0a2bb0f544 · 2020-08-10T19:11:26.000-04:00
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
@@ -2624,7 +2624,8 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
     while( isspace( *pBind ) )
         ++pBind;
 
-    strncpy( achAddr, pBind, 256 );
+    strncpy(achAddr, pBind, 255);
+    achAddr[255] = 0;
 
     switch( *p )
     {

Original file line number	Diff line number	Diff line change
`@@ -2624,7 +2624,8 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )`
`2624`	`2624`	`while( isspace( *pBind ) )`
`2625`	`2625`	`++pBind;`
`2626`	`2626`
`2627`		`- strncpy( achAddr, pBind, 256 );`
	`2627`	`+ strncpy(achAddr, pBind, 255);`
	`2628`	`+ achAddr[255] = 0;`
`2628`	`2629`
`2629`	`2630`	`switch( *p )`
`2630`	`2631`	`{`