diff options
| author | Anatol Belski <ab@php.net> | 2016-01-11 09:46:53 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-11 09:46:53 +0100 |
| commit | 39e571c8d84467a54c357549e35227d87980c440 (patch) | |
| tree | 868bc72df941053adde1d425416e709fe238bd18 /ext/interbase/php_ibase_udf.c | |
| parent | 57a2a8d4fa61b23852f0ef8b1323128f421817c7 (diff) | |
| download | php-git-39e571c8d84467a54c357549e35227d87980c440.tar.gz | |
further datatype and range check fixes for ibase
Diffstat (limited to 'ext/interbase/php_ibase_udf.c')
| -rw-r--r-- | ext/interbase/php_ibase_udf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c index 7102c17c56..e3fe6e7edc 100644 --- a/ext/interbase/php_ibase_udf.c +++ b/ext/interbase/php_ibase_udf.c @@ -250,8 +250,8 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv) case dtype_int64: l = *(ISC_INT64*)argv[i]->dsc_address; - if (argv[i]->dsc_scale == 0 && l <= LONG_MAX && l >= LONG_MIN) { - ZVAL_LONG(&args[i], (long)l); + if (argv[i]->dsc_scale == 0 && l <= ZEND_LONG_MAX && l >= ZEND_LONG_MIN) { + ZVAL_LONG(&args[i], (zend_long)l); } else { ZVAL_DOUBLE(&args[i], ((double)l)/scales[-argv[i]->dsc_scale]); } @@ -309,8 +309,8 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv) case IS_LONG: r->dsc_dtype = dtype_long; - *(long*)r->dsc_address = Z_LVAL(return_value); - r->dsc_length = sizeof(long); + *(zend_long*)r->dsc_address = Z_LVAL(return_value); + r->dsc_length = sizeof(zend_long); break; case IS_DOUBLE: |