[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci oci_statement.c
tony2001Fri Jan 26 15:07:45 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_ocioci_statement.c
Log:
fix leak
readuce size of the buffer to prevent ORA-01461
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.10.2.4r2=1.16.2.10.2.5diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.4
php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.5
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.4 Mon Jan 22 12:49:22 2007
+++ php-src/ext/pdo_oci/oci_statement.c Fri Jan 26 15:07:45 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.16.2.10.2.4 2007/01/22 12:49:22 tony2001 Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.10.2.5 2007/01/26 15:07:45 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -150,6 +150,23 @@
(S-stmt, OCI_HTYPE_STMT, colcount, 0,
OCI_ATTR_PARAM_COUNT, S-err));
stmt-column_count = (int)colcount;
+
+ if (S-cols) {
+ int i;
+ for (i = 0; i stmt-column_count; i++) {
+ if (S-cols[i].data) {
+ switch (S-cols[i].dtype) {
+ case SQLT_BLOB:
+ case SQLT_CLOB:
+ /* do nothing */
+ break;
+ default:
+ efree(S-cols[i].data);
+ }
+ }
+ }
+ efree(S-cols);
+ }
S-cols = ecalloc(colcount, sizeof(pdo_oci_column));
}
@@ -274,7 +291,7 @@
P-oci_type = SQLT_CHR;
value_sz = param-max_value_len;
if (param-max_value_len == 0) {
- value_sz = 4000; /*
maximum size before value is interpreted as a LONG value */
+ value_sz = 1332; /*
maximum size before value is interpreted as a LONG value */
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci oci_statement.c
Wtf? Why is this commit here? Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci oci_statement.c
On 01/26/2007 07:10 PM, Ilia Alshanetsky wrote: Wtf? Why is this commit here? Ilia, most of PDO_OCI tests failed here, so I've fixed the issues which caused that. Do you want me to revert it? (PDO_OCI is hardly usable anyway..) -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci oci_statement.c
tony2001Wed Dec 27 10:31:10 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_ocioci_statement.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.10r2=1.16.2.10.2.1diff_format=u Index: php-src/ext/pdo_oci/oci_statement.c diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.10 php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.1 --- php-src/ext/pdo_oci/oci_statement.c:1.16.2.10 Sat Mar 18 22:06:30 2006 +++ php-src/ext/pdo_oci/oci_statement.c Wed Dec 27 10:31:10 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: oci_statement.c,v 1.16.2.10 2006/03/18 22:06:30 tony2001 Exp $ */ +/* $Id: oci_statement.c,v 1.16.2.10.2.1 2006/12/27 10:31:10 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -222,7 +222,7 @@ zval_dtor(param-parameter); Z_STRLEN_P(param-parameter) = param-max_value_len; - Z_STRVAL_P(param-parameter) = emalloc(Z_STRLEN_P(param-parameter)+1); + Z_STRVAL_P(param-parameter) = ecalloc(1, Z_STRLEN_P(param-parameter)+1); P-used_for_output = 1; P-actual_len = Z_STRLEN_P(param-parameter); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
