cvs: php-src /ext/fdf fdf.c

iliaa Wed Jan 3 03:55:29 2007 UTC Modified files: /php-src/ext/fdf fdf.c Log: MFB: Added filter callback Unlink temporary file on error http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.100&r2=1.101&diff_format=u Index: php-src/ext/fdf/fdf.c diff -u php-src/ext/fdf/fdf.c:1.100 php-src/ext/fdf/fdf.c:1.101 --- php-src/ext/fdf/fdf.c:1.100 Mon Jan 1 09:29:23 2007 +++ php-src/ext/fdf/fdf.c Wed Jan 3 03:55:29 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.100 2007/01/01 09:29:23 sebastian Exp $ */ +/* $Id: fdf.c,v 1.101 2007/01/03 03:55:29 iliaa Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -1442,22 +1442,26 @@ if(nBytes>0) { err = FDFGetValue(theFDF, name, value, value_len-1, &nBytes); if(err == FDFErcOK && nBytes != 0) { + unsigned int new_val_len; + for(p=value;*p;p++) if(*p=='\r') *p='\n'; if(lastfieldname) efree(lastfieldname); - lastfieldname = estrdup(name); - php_register_variable(name, value, array_ptr TSRMLS_CC); + lastfieldname = estrdup(name); + + if (sapi_module.input_filter(PARSE_POST, name, &value, value_len - 1, &new_val_len TSRMLS_CC)) { + php_register_variable_safe(name, value, new_val_len, array_ptr TSRMLS_CC); + } } } } - FDFClose(theFDF); - VCWD_UNLINK((const char *)filename); - efree(filename); if(name) efree(name); if(value) efree(value); if(lastfieldname) efree(lastfieldname); } + VCWD_UNLINK((const char *)filename); + efree(filename); } /* }}} */