diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
| commit | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (patch) | |
| tree | e561a58d6e084c5e4cbdde1f84aed16cf4724383 /ext/phar/util.c | |
| parent | 1e8273964fbd517a2eb9e560f9cdb4afffa0c034 (diff) | |
| download | php-git-63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc.tar.gz | |
basic macro replacements, all at once
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 4bac776511..ba8eb7ba24 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1406,7 +1406,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, ZVAL_EMPTY_STRING(&zp[0]); } - if (end != Z_STRLEN(zp[0])) { + if (end != Z_STRSIZE(zp[0])) { zval_dtor(&zp[0]); zval_dtor(&zp[1]); zval_dtor(&zp[2]); @@ -1457,15 +1457,15 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, switch (Z_TYPE(retval)) { default: - case IS_LONG: + case IS_INT: zval_dtor(&zp[1]); - if (1 == Z_LVAL(retval)) { + if (1 == Z_IVAL(retval)) { return SUCCESS; } return FAILURE; case IS_TRUE: - *signature = estrndup(Z_STRVAL(zp[1]), Z_STRLEN(zp[1])); - *signature_len = Z_STRLEN(zp[1]); + *signature = estrndup(Z_STRVAL(zp[1]), Z_STRSIZE(zp[1])); + *signature_len = Z_STRSIZE(zp[1]); zval_dtor(&zp[1]); return SUCCESS; case IS_FALSE: |