Ignore further libxml leaks; update ignore leak macros

We cater to two more potentially leaking libxml functions.

We also need to update the `ZEND_IGNORE_LEAKS_BEGIN|END()` macros,
since we now have to cater to recursion, so we need to store the
original value of `_crtDbgFlag` and reset it afterwards.

Author: cmb69

Zend/zend_portability.h

@@ -733,8 +733,11 @@ extern "C++" {
 #endif
 
 #if defined(ZEND_WIN32) && defined(_DEBUG)
-# define ZEND_IGNORE_LEAKS_BEGIN() _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) & ~_CRTDBG_ALLOC_MEM_DF)
-# define ZEND_IGNORE_LEAKS_END() _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF)
+# define ZEND_IGNORE_LEAKS_BEGIN() \
+	int zend_crtDbgFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); \
+	_CrtSetDbgFlag(zend_crtDbgFlag & ~_CRTDBG_ALLOC_MEM_DF)
+# define ZEND_IGNORE_LEAKS_END() \
+	_CrtSetDbgFlag(zend_crtDbgFlag)
 #else
 # define ZEND_IGNORE_LEAKS_BEGIN()
 # define ZEND_IGNORE_LEAKS_END()

ext/dom/document.c

@@ -1917,7 +1917,9 @@ static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
 		(xmlSchemaValidityErrorFunc) php_libxml_error_handler,
 		(xmlSchemaValidityWarningFunc) php_libxml_error_handler,
 		parser);
+	ZEND_IGNORE_LEAKS_BEGIN();
 	sptr = xmlSchemaParse(parser);
+	ZEND_IGNORE_LEAKS_END();
 	xmlSchemaFreeParserCtxt(parser);
 	PHP_LIBXML_RESTORE_GLOBALS(new_parser_ctxt);
 	if (!sptr) {

ext/xmlreader/php_xmlreader.c

@@ -337,7 +337,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
 	ZEND_IGNORE_LEAKS_BEGIN();
 	sptr = xmlRelaxNGParse(parser);
 	ZEND_IGNORE_LEAKS_END();
-	
+
 	xmlRelaxNGFreeParserCtxt(parser);
 	PHP_LIBXML_RESTORE_GLOBALS(parse);
 
@@ -1085,7 +1085,9 @@ PHP_METHOD(XMLReader, setSchema)
 	intern = Z_XMLREADER_P(id);
 	if (intern && intern->ptr) {
 		PHP_LIBXML_SANITIZE_GLOBALS(schema);
+		ZEND_IGNORE_LEAKS_BEGIN();
 		retval = xmlTextReaderSchemaValidate(intern->ptr, source);
+		ZEND_IGNORE_LEAKS_END();
 		PHP_LIBXML_RESTORE_GLOBALS(schema);
 
 		if (retval == 0) {