Merge pull request trusteddomainproject#239 from aafbsd/develop

futatuki · futatuki · commit 40c0437f1d09 · 2024-12-23T00:18:11.000+09:00
Fix: do not use strlcpy() if buffers overlap
diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
@@ -12358,8 +12358,10 @@ mlfi_eoh(SMFICTX *ctx)
 
 				if (domainok)
 				{
-					strlcpy((char *) dfc->mctx_domain, p,
-					        sizeof dfc->mctx_domain);
+					// We must not use strlcpy() here since
+					// src and dst overlap.
+					char* p2 = dfc->mctx_domain;
+					while( (*p2++ = *p++) );
 					break;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -12358,8 +12358,10 @@ mlfi_eoh(SMFICTX *ctx)`
`12358`	`12358`
`12359`	`12359`	`if (domainok)`
`12360`	`12360`	`{`
`12361`		`- strlcpy((char *) dfc->mctx_domain, p,`
`12362`		`- sizeof dfc->mctx_domain);`
	`12361`	`+ // We must not use strlcpy() here since`
	`12362`	`+ // src and dst overlap.`
	`12363`	`+ char* p2 = dfc->mctx_domain;`
	`12364`	`+ while( (p2++ = p++) );`
`12363`	`12365`	`break;`
`12364`	`12366`	`}`
`12365`	`12367`	`}`