diff options
Diffstat (limited to 'ext/gmp/gmp.c')
| -rw-r--r-- | ext/gmp/gmp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 663bbc96e4..0cac3dee4c 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -573,8 +573,8 @@ static int gmp_serialize(zval *object, unsigned char **buffer, size_t *buf_len, php_var_serialize(&buf, &zv, &serialize_data); PHP_VAR_SERIALIZE_DESTROY(serialize_data); - *buffer = (unsigned char *) estrndup(buf.s->val, buf.s->len); - *buf_len = buf.s->len; + *buffer = (unsigned char *) estrndup(ZSTR_VAL(buf.s), ZSTR_LEN(buf.s)); + *buf_len = ZSTR_LEN(buf.s); zend_string_release(buf.s); return SUCCESS; @@ -760,7 +760,7 @@ static void gmp_strval(zval *result, mpz_t gmpnum, int base) /* {{{ */ } str = zend_string_alloc(num_len, 0); - mpz_get_str(str->val, base, gmpnum); + mpz_get_str(ZSTR_VAL(str), base, gmpnum); /* * From GMP documentation for mpz_sizeinbase(): @@ -770,10 +770,10 @@ static void gmp_strval(zval *result, mpz_t gmpnum, int base) /* {{{ */ * So let's check to see if we already have a \0 byte... */ - if (str->val[str->len - 1] == '\0') { - str->len--; + if (ZSTR_VAL(str)[ZSTR_LEN(str) - 1] == '\0') { + ZSTR_LEN(str)--; } else { - str->val[str->len] = '\0'; + ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0'; } ZVAL_NEW_STR(result, str); @@ -1149,8 +1149,8 @@ ZEND_FUNCTION(gmp_export) size_t out_len = count * size; zend_string *out_string = zend_string_alloc(out_len, 0); - mpz_export(out_string->val, NULL, order, size, endian, 0, gmpnumber); - out_string->val[out_len] = '\0'; + mpz_export(ZSTR_VAL(out_string), NULL, order, size, endian, 0, gmpnumber); + ZSTR_VAL(out_string)[out_len] = '\0'; RETURN_NEW_STR(out_string); } |