archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source
This commit is contained in:
George Wang 2025-05-15 11:53:07 -04:00
commit 72efe6dcdf
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/litespeed/lsapilib.c
View file

@ -2652,7 +2652,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
{ {
case '/': case '/':
pAddr->sa_family = AF_UNIX; pAddr->sa_family = AF_UNIX;
strncpy( ((struct sockaddr_un *)pAddr)->sun_path, p, memccpy(((struct sockaddr_un *)pAddr)->sun_path, p, 0,
sizeof(((struct sockaddr_un *)pAddr)->sun_path)); sizeof(((struct sockaddr_un *)pAddr)->sun_path));
return 0; return 0;

4
sapi/litespeed/lscriu.c
View file

@ -417,7 +417,9 @@ static int LSCRIU_Native_Dump(pid_t iPid,
memset(&criu_native_dump, 0, sizeof(criu_native_dump)); memset(&criu_native_dump, 0, sizeof(criu_native_dump));
criu_native_dump.m_iPidToDump = iPid; criu_native_dump.m_iPidToDump = iPid;
strncpy(criu_native_dump.m_chImageDirectory, pchImagePath, strncpy(criu_native_dump.m_chImageDirectory, pchImagePath,
sizeof(criu_native_dump.m_chImageDirectory)); sizeof(criu_native_dump.m_chImageDirectory) - 1);
criu_native_dump.m_chImageDirectory[
sizeof(criu_native_dump.m_chImageDirectory) - 1] = '\0';
pchLastSlash = strrchr(criu_native_dump.m_chSocketDir,'/'); pchLastSlash = strrchr(criu_native_dump.m_chSocketDir,'/');
if (pchLastSlash) { if (pchLastSlash) {
pchLastSlash++; pchLastSlash++;