From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 7 Aug 2011 16:10:34 +0000 (+0000)
Subject: Fix more signed 1-bit bitfield, and let's use strlcpy/strlcat instead for these
X-Git-Tag: php-5.3.7RC5~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37c18f5ebe5cac05f31ad18a11c7f8f4a38e6935;p=php

Fix more signed 1-bit bitfield, and let's use strlcpy/strlcat instead for these
static string copies
---

diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h
index 62b3bb9188..774cd76f14 100755
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
@@ -58,7 +58,7 @@ extern pdo_driver_t *pdo_find_driver(const char *name, int namelen);
 extern void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC);
 
 #define PDO_DBH_CLEAR_ERR()		do { \
-	strncpy(dbh->error_code, PDO_ERR_NONE, sizeof(PDO_ERR_NONE)); \
+	strlcpy(dbh->error_code, PDO_ERR_NONE, sizeof(PDO_ERR_NONE)); \
 	if (dbh->query_stmt) { \
 		dbh->query_stmt = NULL; \
 		zend_objects_store_del_ref(&dbh->query_stmt_zval TSRMLS_CC); \
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
index e0d72448c2..ef711b81e4 100644
--- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c
@@ -382,7 +382,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out)
 	/* Now make the output string */
 	memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 	strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
-	strncat(passwd, "$", 1);
+	strlcat(passwd, "$", 1);
 
 	PHP_MD5Final(final, &ctx);