cvs: php-src(PHP_5_2) /ext/oci8 oci8_interface.c

tony2001 Mon Dec 11 12:34:09 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8_interface.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.4&r2=1.8.2.7.2.5&diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.4 php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.5 --- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.4 Fri Nov 10 23:03:32 2006 +++ php-src/ext/oci8/oci8_interface.c Mon Dec 11 12:34:09 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_interface.c,v 1.8.2.7.2.4 2006/11/10 23:03:32 tony2001 Exp $ */ +/* $Id: oci8_interface.c,v 1.8.2.7.2.5 2006/12/11 12:34:09 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -587,7 +587,8 @@ { zval **tmp, *z_descriptor = getThis(); php_oci_descriptor *descriptor; - ub4 trim_length = 0; + long trim_length = 0; + ub4 ub_trim_length; if (getThis()) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &trim_length) == FAILURE) { @@ -604,10 +605,16 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property"); RETURN_FALSE; } - + + if (trim_length < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length must be greater than or equal to zero"); + RETURN_FALSE; + } + + ub_trim_length = (ub4) trim_length; PHP_OCI_ZVAL_TO_DESCRIPTOR(*tmp, descriptor); - if (php_oci_lob_truncate(descriptor, trim_length TSRMLS_CC)) { + if (php_oci_lob_truncate(descriptor, ub_trim_length TSRMLS_CC)) { RETURN_FALSE; } RETURN_TRUE;