In XML mode, properly escape test strings in the preamble.

Fixes #244923.  (Zhujunling@huawei.com)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11227

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 386b72ec791a6900679d446e4cee98f9ec78bfbd..ce1411a9f3c1b7b0e73884fb8dedfe2d2490b119 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1027,7 +1027,7 @@ static void print_preamble ( Bool logging_to_fd,
          VG_(printf_xml)("<preamble>\n");
 
       /* Tool details */
-      umsg_or_xml( "%s%s%s%s, %s%s\n",
+      umsg_or_xml( VG_(clo_xml) ? "%s%t%t%t, %t%s\n" : "%s%s%s%s, %s%s\n",
                    xpre,
                    VG_(details).name, 
                    NULL == VG_(details).version ? "" : "-",
@@ -1043,7 +1043,8 @@ static void print_preamble ( Bool logging_to_fd,
          );
       }
 
-      umsg_or_xml("%s%s%s\n", xpre, VG_(details).copyright_author, xpost);
+      umsg_or_xml( VG_(clo_xml) ? "%s%t%s\n" : "%s%s%s\n",
+                   xpre, VG_(details).copyright_author, xpost );
 
       /* Core details */
       umsg_or_xml(