cvs: php4(PHP_4_3) /ext/fdf fdf.c

iliaa Wed May 21 13:04:19 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/fdf fdf.c Log: MFH Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.66.2.7 php4/ext/fdf/fdf.c:1.66.2.8 --- php4/ext/fdf/fdf.c:1.66.2.7 Tue May 13 18:10:27 2003 +++ php4/ext/fdf/fdf.c Wed May 21 13:04:19 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.66.2.7 2003/05/13 22:10:27 sniper Exp $ */ +/* $Id: fdf.c,v 1.66.2.8 2003/05/21 17:04:19 iliaa Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -224,6 +224,10 @@ convert_to_string_ex(file); + if (php_check_open_basedir(Z_STRVAL_PP(file) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(file), "wb+", CHECKUID_CHECK_MODE_PARAM))) { + RETURN_FALSE; + } + err = FDFOpen(Z_STRVAL_PP(file), 0, &fdf); if(err != FDFErcOK || !fdf) { @@ -511,6 +515,11 @@ convert_to_string_ex(fieldname); convert_to_long_ex(face); convert_to_string_ex(filename); + + if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(filename), "wb+", CHECKUID_CHECK_MODE_PARAM))) { + RETURN_FALSE; + } + convert_to_long_ex(pagenr); switch(Z_LVAL_PP(face)) { @@ -562,6 +571,10 @@ ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf); + if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) { + RETURN_FALSE; + } + switch(face) { case 1: facenr = FDFNormalAP; @@ -771,6 +784,9 @@ ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf); if(filename) { + if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) { + RETURN_FALSE; + } err = FDFSave(fdf, filename); } else { FILE *fp; @@ -884,6 +900,10 @@ convert_to_string_ex(filename); convert_to_string_ex(template); convert_to_long_ex(rename); + + if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(filename), "wb+", CHECKUID_CHECK_MODE_PARAM))) { + RETURN_FALSE; + } filespec.FS = NULL; filespec.F = Z_STRVAL_PP(filename);