1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00

fix allocation and copy issue

This commit is contained in:
Anthony Ferrara
2012-10-06 12:33:48 -04:00
parent 1751d5fabe
commit 76e83f769f
+3 -3
View File
@@ -247,7 +247,7 @@ PHP_FUNCTION(password_needs_rehash)
if (Z_TYPE_PP(option_buffer) != IS_LONG) {
zval *cast_option_buffer;
ALLOC_ZVAL(cast_option_buffer);
INIT_PZVAL_COPY(cast_option_buffer, *option_buffer);
MAKE_COPY_ZVAL(option_buffer, cast_option_buffer);
convert_to_long(cast_option_buffer);
new_cost = Z_LVAL_P(cast_option_buffer);
zval_dtor(cast_option_buffer);
@@ -328,7 +328,7 @@ PHP_FUNCTION(password_hash)
if (Z_TYPE_PP(option_buffer) != IS_LONG) {
zval *cast_option_buffer;
ALLOC_ZVAL(cast_option_buffer);
INIT_PZVAL_COPY(cast_option_buffer, *option_buffer);
MAKE_COPY_ZVAL(option_buffer, cast_option_buffer);
convert_to_long(cast_option_buffer);
cost = Z_LVAL_P(cast_option_buffer);
zval_dtor(cast_option_buffer);
@@ -368,7 +368,7 @@ PHP_FUNCTION(password_hash)
case IS_OBJECT: {
zval *cast_option_buffer;
ALLOC_ZVAL(cast_option_buffer);
INIT_PZVAL_COPY(cast_option_buffer, *option_buffer);
MAKE_COPY_ZVAL(option_buffer, cast_option_buffer);
convert_to_string(cast_option_buffer);
if (Z_TYPE_P(cast_option_buffer) == IS_STRING) {
buffer = estrndup(Z_STRVAL_P(cast_option_buffer), Z_STRLEN_P(cast_option_buffer));