mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make contrib/xml2 use core xml.c's error handler, when available (that is,

Browse Source 
in versions >= 8.3).  The core code is more robust and efficient than what
was there before, and this also reduces risks involved in swapping different
libxml error handler settings.

Before 8.3, there is still some risk of problems if add-on modules such as
Perl invoke libxml without setting their own error handler.  Given the lack
of reports I'm not sure there's a risk in practice, so I didn't take the
step of actually duplicating the core code into older contrib/xml2 branches.
Instead I just tweaked the existing code to ensure it didn't leave a dangling
pointer to short-lived memory when throwing an error.
This commit is contained in:
Tom Lane 2010-03-03 19:10:40 +00:00
parent 57e9e01ecd
commit c4810d9ae0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/xml2/xpath.c
View File

@ -103,9 +103,20 @@ elog_error(const char *explain, bool force)
(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
errmsg("%s", explain)));
else
{
/*
* Ensure pgxml_errorMsg is reset to null before we give up
* control. This provides some protection against crashes if
* pgxml_errorHandler is invoked again later, perhaps as a
* result of other modules' use of libxml.
*/
char *msg = pgxml_errorMsg;
pgxml_errorMsg = NULL;
ereport(ERROR,
(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
errmsg("%s: %s", explain, pgxml_errorMsg)));
errmsg("%s: %s", explain, msg)));
}
}
}