diff options
Diffstat (limited to 'ext/dba/dba.c')
| -rw-r--r-- | ext/dba/dba.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 7b675ac6ac..1d106160dc 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -217,10 +217,10 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS name = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos); convert_to_string_ex(group); convert_to_string_ex(name); - if (Z_STRLEN_P(group) == 0) { + if (Z_STRSIZE_P(group) == 0) { *key_str = Z_STRVAL_P(name); *key_free = NULL; - return Z_STRLEN_P(name); + return Z_STRSIZE_P(name); } len = spprintf(key_str, 0, "[%s]%s", Z_STRVAL_P(group), Z_STRVAL_P(name)); *key_free = *key_str; @@ -232,8 +232,8 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS ZVAL_COPY(&tmp, key); convert_to_string(&tmp); - *key_free = *key_str = estrndup(Z_STRVAL(tmp), Z_STRLEN(tmp)); - len = Z_STRLEN(tmp); + *key_free = *key_str = estrndup(Z_STRVAL(tmp), Z_STRSIZE(tmp)); + len = Z_STRSIZE(tmp); zval_ptr_dtor(&tmp); return len; @@ -646,7 +646,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } else if (Z_REFCOUNTED(args[i])) { Z_ADDREF(args[i]); } - keylen += Z_STRLEN(args[i]); + keylen += Z_STRSIZE(args[i]); } if (persistent) { @@ -658,8 +658,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) keylen = 0; for(i = 0; i < ac; i++) { - memcpy(key+keylen, Z_STRVAL(args[i]), Z_STRLEN(args[i])); - keylen += Z_STRLEN(args[i]); + memcpy(key+keylen, Z_STRVAL(args[i]), Z_STRSIZE(args[i])); + keylen += Z_STRSIZE(args[i]); } /* try to find if we already have this link in our persistent list */ |