mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-03 06:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
static string copies
This commit is contained in:
Rasmus Lerdorf 2011-08-07 16:10:34 +00:00
parent 2449c41698
commit 37c18f5ebe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/pdo/php_pdo_int.h
View File

@ -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); \

2
ext/standard/php_crypt_r.c
View File

@ -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);