From: Julian Seward <jseward@acm.org>
Date: Fri, 23 Jul 2010 17:03:22 +0000 (+0000)
Subject: In XML mode, properly escape test strings in the preamble.
X-Git-Tag: svn/VALGRIND_3_6_0~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5436418b9060c3f0517c95499c61139a074f888;p=thirdparty%2Fvalgrind.git

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 386b72ec79..ce1411a9f3 100644
--- 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(