cvs: /php3 ChangeLog /php3/functions oci8.c

thies Mon Sep 13 07:51:49 1999 EDT Modified files: /php3 ChangeLog /php3/functions oci8.c Log: safe-mode fix + mem-leak fix Index: php3/ChangeLog diff -u php3/ChangeLog:1.758 php3/ChangeLog:1.759 --- php3/ChangeLog:1.758 Sun Sep 12 14:03:01 1999 +++ php3/ChangeLog Mon Sep 13 07:51:49 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Safe-Mode fix for oci8 savefile() function. (Thies) - Added ldap_get_values_len function (Stig Venaas) - Added more functions to posix module. - Close loophole that allowed virtual() to be used on a PHP file Index: php3/functions/oci8.c diff -u php3/functions/oci8.c:1.121 php3/functions/oci8.c:1.122 --- php3/functions/oci8.c:1.121 Sat Aug 28 20:56:52 1999 +++ php3/functions/oci8.c Mon Sep 13 07:51:49 1999 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.121 1999/08/29 00:56:52 jim Exp $ */ +/* $Id: oci8.c,v 1.122 1999/09/13 11:51:49 thies Exp $ */ /* TODO list: * @@ -2707,6 +2707,12 @@ WRONG_PARAM_COUNT; } + convert_to_string(arg); + + if (_php3_check_open_basedir(arg->value.str.val)) { + RETURN_FALSE; + } + filename = arg->value.str.val; if ((fp = open(filename, O_RDONLY)) == -1) { @@ -3243,6 +3249,7 @@ } if (array->type != IS_ARRAY) { + php3tls_pval_destructor(array); if (array_init(array) == FAILURE) { php3_error(E_WARNING, "OCIFetchInto: unable to convert arg 2 to array"); RETURN_FALSE; @@ -3335,6 +3342,7 @@ } if (array->type != IS_ARRAY) { + php3tls_pval_destructor(array); if (array_init(array) == FAILURE) { php3_error(E_WARNING, "OCIFetchStatement: unable to convert arg 2 to array"); RETURN_FALSE;