Commit 72efe6d

committed

Merge branch 'PHP-8.3' into PHP-8.4

2 parents 73321e2 + 8e5b312 commit 72efe6dCopy full SHA for 72efe6d

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2652,8 +2652,8 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )`
`2652`	`2652`	`{`
`2653`	`2653`	`case '/':`
`2654`	`2654`	`pAddr->sa_family = AF_UNIX;`
`2655`		`- strncpy( ((struct sockaddr_un *)pAddr)->sun_path, p,`
`2656`		`- sizeof(((struct sockaddr_un *)pAddr)->sun_path));`
	`2655`	`+ memccpy(((struct sockaddr_un *)pAddr)->sun_path, p, 0,`
	`2656`	`+ sizeof(((struct sockaddr_un *)pAddr)->sun_path));`
`2657`	`2657`	`return 0;`
`2658`	`2658`
`2659`	`2659`	`case '[':`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,9 @@ static int LSCRIU_Native_Dump(pid_t iPid,`
`417`	`417`	`memset(&criu_native_dump, 0, sizeof(criu_native_dump));`
`418`	`418`	`criu_native_dump.m_iPidToDump = iPid;`
`419`	`419`	`strncpy(criu_native_dump.m_chImageDirectory, pchImagePath,`
`420`		`- sizeof(criu_native_dump.m_chImageDirectory));`
	`420`	`+ sizeof(criu_native_dump.m_chImageDirectory) - 1);`
	`421`	`+ criu_native_dump.m_chImageDirectory[`
	`422`	`+ sizeof(criu_native_dump.m_chImageDirectory) - 1] = '0円';`
`421`	`423`	`pchLastSlash = strrchr(criu_native_dump.m_chSocketDir,'/');`
`422`	`424`	`if (pchLastSlash) {`
`423`	`425`	`pchLastSlash++;`

Comments

(0)