--- embedaddon/php/Zend/zend_ini_scanner.l 2012/02/21 23:47:52 1.1.1.1 +++ embedaddon/php/Zend/zend_ini_scanner.l 2012/05/29 12:34:35 1.1.1.2 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_scanner.l,v 1.1.1.1 2012/02/21 23:47:52 misho Exp $ */ +/* $Id: zend_ini_scanner.l,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */ #include #include "zend.h" @@ -228,9 +228,12 @@ int zend_ini_open_file_for_scanning(zend_file_handle * char *buf; size_t size; - if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE || - init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE - ) { + if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE) { + return FAILURE; + } + + if (init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE) { + zend_file_handle_dtor(fh TSRMLS_CC); return FAILURE; }