Merge pull request trusteddomainproject#239 from aafbsd/develop

Fix: do not use strlcpy() if buffers overlap

Author: futatuki

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;
 				}
 			}