diff options
Diffstat (limited to 'ext/standard/base64.c')
| -rw-r--r-- | ext/standard/base64.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ext/standard/base64.c b/ext/standard/base64.c index c8f037654c..82e35f5efe 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -160,11 +160,9 @@ PHP_FUNCTION(base64_encode) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); - result = php_base64_encode((*str)->value.str.val, (*str)->value.str.len, &ret_length); + result = php_base64_encode(Z_STRVAL_PP(str), Z_STRLEN_PP(str), &ret_length); if (result != NULL) { - return_value->value.str.val = result; - return_value->value.str.len = ret_length; - return_value->type = IS_STRING; + RETVAL_STRINGL(result, ret_length, 0); } else { RETURN_FALSE; } @@ -183,11 +181,9 @@ PHP_FUNCTION(base64_decode) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); - result = php_base64_decode((*str)->value.str.val, (*str)->value.str.len, &ret_length); + result = php_base64_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str), &ret_length); if (result != NULL) { - return_value->value.str.val = result; - return_value->value.str.len = ret_length; - return_value->type = IS_STRING; + RETVAL_STRINGL(result, ret_length, 0); } else { RETURN_FALSE; } |