Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed invalid ZEPHIR_METHOD_GLOBALS_PTR call #1942

Merged
merged 2 commits into from Oct 3, 2019
Merged

Fixed invalid ZEPHIR_METHOD_GLOBALS_PTR call #1942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90a4cf
Fixed ZEPHIR_METHOD_GLOBALS_PTR call
sergeyklay Oct 3, 2019
41259a9
Added change log
sergeyklay Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## [0.12.6] - 2019-10-03
### Fixed
- Fixed regression introduced in `0.12.5` for those users who doesn't use
bundled `ext/json/php_json.h` [#1940](https://github.com/phalcon/zephir/issues/1940)

## [0.12.5] - 2019-10-02
### Changed
- Update `zend_update_static_property` to be compatible with PHP >= 7.3
Expand Down Expand Up @@ -242,7 +247,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Fixed casting resource to int (only ZendEngine 3)
[#1524](https://github.com/phalcon/zephir/issues/1524)

[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.5...HEAD
[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.6...HEAD
[0.12.6]: https://github.com/phalcon/zephir/compare/0.12.5...0.12.6
[0.12.5]: https://github.com/phalcon/zephir/compare/0.12.4...0.12.5
[0.12.4]: https://github.com/phalcon/zephir/compare/0.12.3...0.12.4
[0.12.3]: https://github.com/phalcon/zephir/compare/0.12.2...0.12.3
Expand Down
22 changes: 10 additions & 12 deletions kernels/ZendEngine3/string.c
View file
Open in desktop
Expand Up @@ -402,17 +402,17 @@ static void zephir_append_printable_zval(smart_str *implstr, zval *tmp)

void zephir_append_printable_array(smart_str *implstr, const zval *value)
{

zval *tmp;
zend_array *arr;
unsigned int numelems, i = 0;
zend_array *arr;
unsigned int numelems;

arr = Z_ARRVAL_P(value);
numelems = zend_hash_num_elements(arr);

smart_str_appendc(implstr, '[');

if (numelems > 0) {
zval *tmp;
unsigned int i = 0;

ZEND_HASH_FOREACH_VAL(arr, tmp) {

Expand Down Expand Up @@ -1191,7 +1191,7 @@ int zephir_json_encode(zval *return_value, zval *v, int opts)
zval zopts;
zval *params[2];

ZEPHIR_INIT_VAR(&zopts);
ZEPHIR_NULL(&zopts);
ZVAL_LONG(&zopts, opts);

params[0] = v;
Expand All @@ -1205,7 +1205,7 @@ int zephir_json_decode(zval *return_value, zval *v, zend_bool assoc)
zval zassoc;
zval *params[2];

ZEPHIR_INIT_VAR(&zassoc);
ZEPHIR_NULL(&zassoc);
ZVAL_BOOL(&zassoc, assoc);

params[0] = v;
Expand All @@ -1222,10 +1222,9 @@ void zephir_md5(zval *return_value, zval *str)
unsigned char digest[16];
char hexdigest[33];
zval copy;
int use_copy = 0;

if (Z_TYPE_P(str) != IS_STRING) {
use_copy = zend_make_printable_zval(str, &copy);
int use_copy = zend_make_printable_zval(str, &copy);
if (use_copy) {
str = ©
}
Expand Down Expand Up @@ -1274,7 +1273,6 @@ void zephir_crc32(zval *return_value, zval *str)
void zephir_ucfirst(zval *return_value, zval *s)
{
zval copy;
char *c;
int use_copy = 0;

if (UNEXPECTED(Z_TYPE_P(s) != IS_STRING)) {
Expand All @@ -1286,8 +1284,8 @@ void zephir_ucfirst(zval *return_value, zval *s)

if (!Z_STRLEN_P(s)) {
ZVAL_EMPTY_STRING(return_value);
}
else {
} else {
char *c;
ZVAL_STRINGL(return_value, Z_STRVAL_P(s), Z_STRLEN_P(s));
c = Z_STRVAL_P(return_value);
*c = toupper((unsigned char)*c);
Expand Down Expand Up @@ -1407,7 +1405,7 @@ void zephir_string_to_hex(zval *return_value, zval *var)
res = zend_string_alloc(2*Z_STRLEN_P(var) + 1, 0);
s = Z_STRVAL_P(var);
for (i=0; i<Z_STRLEN_P(var); ++i) {
sprintf(res->val + 2*i, "%hhX", s[i]);
sprintf(res->val + 2*i, "%hhX", (unsigned char) s[i]);
}

res->val[2*Z_STRLEN_P(var)] = 0;
Expand Down