- strncpy returns the byte copied not error code or 0

pierrejoye · pierrejoye · commit 818c4d75c8ca · 2008-08-20T13:27:10.000Z
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
@@ -211,7 +211,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) {
 	strcat_s(passwd, MD5_HASH_MAX_LEN, "$");
 #else
 	/* VC6 version doesn't have strcat_s or strncpy_s */
-	if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) != 0) {
+	if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) < sl) {
 		goto _destroyCtx1;
 	}
 	strcat(passwd, "$");

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ char * php_md5_crypt_r(const char pw, const char salt, char *out) {`
`211`	`211`	`strcat_s(passwd, MD5_HASH_MAX_LEN, "$");`
`212`	`212`	`#else`
`213`	`213`	`/* VC6 version doesn't have strcat_s or strncpy_s */`
`214`		`- if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) != 0) {`
	`214`	`+ if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) < sl) {`
`215`	`215`	`goto _destroyCtx1;`
`216`	`216`	`}`
`217`	`217`	`strcat(passwd, "$");`