rasmus Sun, 07 Aug 2011 15:38:36 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314434
Log: Make static analyzers happy Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c U php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c U php/php-src/trunk/ext/standard/php_crypt_r.c Modified: php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2011-08-07 15:12:34 UTC (rev 314433) +++ php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2011-08-07 15:38:36 UTC (rev 314434) @@ -382,7 +382,7 @@ /* Now make the output string */ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); - strcat(passwd, "$"); + strncat(passwd, "$", 1); PHP_MD5Final(final, &ctx); Modified: php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c 2011-08-07 15:12:34 UTC (rev 314433) +++ php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c 2011-08-07 15:38:36 UTC (rev 314434) @@ -377,7 +377,7 @@ /* Now make the output string */ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); - strcat(passwd, "$"); + strncat(passwd, "$", 1); PHP_MD5Final(final, &ctx); Modified: php/php-src/trunk/ext/standard/php_crypt_r.c =================================================================== --- php/php-src/trunk/ext/standard/php_crypt_r.c 2011-08-07 15:12:34 UTC (rev 314433) +++ php/php-src/trunk/ext/standard/php_crypt_r.c 2011-08-07 15:38:36 UTC (rev 314434) @@ -377,7 +377,7 @@ /* Now make the output string */ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); - strcat(passwd, "$"); + strncat(passwd, "$", 1); PHP_MD5Final(final, &ctx);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php