Update ext/libxml APIs so that non-libxml users can hook into the error mechanism

Author: nielsdos

ext/libxml/libxml.c

@@ -598,7 +598,7 @@ static void _php_libxml_free_error(void *ptr)
 	xmlResetError((xmlErrorPtr) ptr);
 }
 
-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
+static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg, int line, int column)
 {
 	xmlError error_copy;
 	int ret;
@@ -611,6 +611,8 @@ static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
 	} else {
 		error_copy.code = XML_ERR_INTERNAL_ERROR;
 		error_copy.level = XML_ERR_ERROR;
+		error_copy.line = line;
+		error_copy.int2 = column;
 		error_copy.message = (char*)xmlStrdup((const xmlChar*)msg);
 		ret = 0;
 	}
@@ -620,17 +622,17 @@ static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
 	}
 }
 
-static void php_libxml_ctx_error_level(int level, void *ctx, const char *msg)
+static void php_libxml_ctx_error_level(int level, void *ctx, const char *msg, int line)
 {
 	xmlParserCtxtPtr parser;
 
 	parser = (xmlParserCtxtPtr) ctx;
 
 	if (parser != NULL && parser->input != NULL) {
 		if (parser->input->filename) {
-			php_error_docref(NULL, level, "%s in %s, line: %d", msg, parser->input->filename, parser->input->line);
+			php_error_docref(NULL, level, "%s in %s, line: %d", msg, parser->input->filename, line);
 		} else {
-			php_error_docref(NULL, level, "%s in Entity, line: %d", msg, parser->input->line);
+			php_error_docref(NULL, level, "%s in Entity, line: %d", msg, line);
 		}
 	} else {
 		php_error_docref(NULL, E_WARNING, "%s", msg);
@@ -640,13 +642,13 @@ static void php_libxml_ctx_error_level(int level, void *ctx, const char *msg)
 void php_libxml_issue_error(int level, const char *msg)
 {
 	if (LIBXML(error_list)) {
-		_php_list_set_error_structure(NULL, msg);
+		_php_list_set_error_structure(NULL, msg, 0, 0);
 	} else {
 		php_error_docref(NULL, level, "%s", msg);
 	}
 }
 
-static void php_libxml_internal_error_handler(int error_type, void *ctx, const char **msg, va_list ap)
+static void php_libxml_internal_error_handler_ex(int error_type, void *ctx, const char **msg, va_list ap, int line, int column)
 {
 	char *buf;
 	int len, len_iter, output = 0;
@@ -666,15 +668,15 @@ static void php_libxml_internal_error_handler(int error_type, void *ctx, const c
 
 	if (output == 1) {
 		if (LIBXML(error_list)) {
-			_php_list_set_error_structure(NULL, ZSTR_VAL(LIBXML(error_buffer).s));
+			_php_list_set_error_structure(NULL, ZSTR_VAL(LIBXML(error_buffer).s), line, column);
 		} else if (!EG(exception)) {
 			/* Don't throw additional notices/warnings if an exception has already been thrown. */
 			switch (error_type) {
 				case PHP_LIBXML_CTX_ERROR:
-					php_libxml_ctx_error_level(E_WARNING, ctx, ZSTR_VAL(LIBXML(error_buffer).s));
+					php_libxml_ctx_error_level(E_WARNING, ctx, ZSTR_VAL(LIBXML(error_buffer).s), line);
 					break;
 				case PHP_LIBXML_CTX_WARNING:
-					php_libxml_ctx_error_level(E_NOTICE, ctx, ZSTR_VAL(LIBXML(error_buffer).s));
+					php_libxml_ctx_error_level(E_NOTICE, ctx, ZSTR_VAL(LIBXML(error_buffer).s), line);
 					break;
 				default:
 					php_error_docref(NULL, E_WARNING, "%s", ZSTR_VAL(LIBXML(error_buffer).s));
@@ -684,6 +686,19 @@ static void php_libxml_internal_error_handler(int error_type, void *ctx, const c
 	}
 }
 
+static void php_libxml_internal_error_handler(int error_type, void *ctx, const char **msg, va_list ap)
+{
+	int line = 0;
+	int column = 0;
+	xmlParserCtxtPtr parser = (xmlParserCtxtPtr) ctx;
+	/* Context is not valid for PHP_LIBXML_ERROR, don't dereference it in that case */
+	if (error_type != PHP_LIBXML_ERROR && parser != NULL && parser->input != NULL) {
+		line = parser->input->line;
+		column = parser->input->col;
+	}
+	php_libxml_internal_error_handler_ex(error_type, ctx, msg, ap, line, column);
+}
+
 static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL,
 		const char *ID, xmlParserCtxtPtr context)
 {
@@ -813,6 +828,14 @@ static xmlParserInputPtr _php_libxml_pre_ext_ent_loader(const char *URL,
 	}
 }
 
+PHP_LIBXML_API void php_libxml_pretend_ctx_error_ex(int line, int column, const char *msg,...)
+{
+	va_list args;
+	va_start(args, msg);
+	php_libxml_internal_error_handler_ex(PHP_LIBXML_CTX_ERROR, NULL, &msg, args, line, column);
+	va_end(args);
+}
+
 PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
 {
 	va_list args;
@@ -831,7 +854,7 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
 
 static void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error)
 {
-	_php_list_set_error_structure(error, NULL);
+	_php_list_set_error_structure(error, NULL, 0, 0);
 
 	return;
 }

ext/libxml/php_libxml.h

@@ -129,6 +129,7 @@ PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node);
 PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object);
 PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...);
 PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_pretend_ctx_error_ex(int line, int column, const char *msg,...);
 PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...);
 PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
 PHP_LIBXML_API void php_libxml_switch_context(zval *context, zval *oldcontext);