|
From: <sv...@va...> - 2011-01-28 00:19:34
|
Author: sewardj
Date: 2011-01-28 00:19:25 +0000 (Fri, 28 Jan 2011)
New Revision: 11514
Log:
In 3 error-path cases, place the closing </valgrindoutput> on the
correct stream (XML instead of plain-text). Fixes #255888.
Modified:
trunk/coregrind/m_errormgr.c
Modified: trunk/coregrind/m_errormgr.c
===================================================================
--- trunk/coregrind/m_errormgr.c 2011-01-27 23:56:36 UTC (rev 11513)
+++ trunk/coregrind/m_errormgr.c 2011-01-28 00:19:25 UTC (rev 11514)
@@ -1114,7 +1114,7 @@
// Check it's not a directory.
if (VG_(is_dir)( filename )) {
if (VG_(clo_xml))
- VG_(umsg)("</valgrindoutput>\n");
+ VG_(printf_xml)("</valgrindoutput>\n");
VG_(umsg)("FATAL: suppressions file \"%s\" is a directory\n", filename );
VG_(exit)(1);
}
@@ -1123,7 +1123,7 @@
sres = VG_(open)( filename, VKI_O_RDONLY, 0 );
if (sr_isError(sres)) {
if (VG_(clo_xml))
- VG_(umsg)("</valgrindoutput>\n");
+ VG_(printf_xml)("</valgrindoutput>\n");
VG_(umsg)("FATAL: can't open suppressions file \"%s\"\n", filename );
VG_(exit)(1);
}
@@ -1275,7 +1275,7 @@
syntax_error:
if (VG_(clo_xml))
- VG_(umsg)("</valgrindoutput>\n");
+ VG_(printf_xml)("</valgrindoutput>\n");
VG_(umsg)("FATAL: in suppressions file \"%s\" near line %d:\n",
filename, lineno );
VG_(umsg)(" %s\n", err_str );
|