diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2011-08-07 16:10:34 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2011-08-07 16:10:34 +0000 |
| commit | 7eb5bbbf65f4e142add0bcd2229a9c5b3ac7abf2 (patch) | |
| tree | 55ca581659c0057b1ed94774c7b2f00c98013740 | |
| parent | d9845c2046990d1f0621cbe6b4091bdc5ba31930 (diff) | |
| download | php-git-7eb5bbbf65f4e142add0bcd2229a9c5b3ac7abf2.tar.gz | |
Fix more signed 1-bit bitfield, and let's use strlcpy/strlcat instead for these
static string copies
| -rwxr-xr-x | ext/pdo/php_pdo_int.h | 2 | ||||
| -rw-r--r-- | ext/standard/php_crypt_r.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 f169c1a745..f4516712da 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -377,7 +377,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); |