From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Mon, 28 Dec 2015 22:02:18 +0000 (+0000)
Subject: Fix 353660  XML in auxwhat tag not escaping reserved symbols properly
X-Git-Tag: svn/VALGRIND_3_12_0~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10876a2dbeaf1d81abbd5bdc10addd8f8481bfee;p=thirdparty%2Fvalgrind.git

Fix 353660  XML in auxwhat tag not escaping reserved symbols properly

Changed a few %s or %pS into %ps in m_addrinfo.c
(based on code reading matching the pattern given in the bug report,
as there was no reproducer).



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

diff --git a/NEWS b/NEWS
index 025721aa78..2d984533c2 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ where XXXXXX is the bug number as listed below.
 353084  arm64 doesn't support sigpending system call
 353370  don't advertise RDRAND in cpuid for Core-i7-4910-like avx2 machine
 353398  WARNING: unhandled amd64-solaris syscall: 207
+353660  XML in auxwhat tag not escaping reserved symbols properly
 353680  s390x: Crash with certain glibc versions due to non-implemented TBEGIN
 353891  Assert 'bad_scanned_addr < VG_ROUNDDN(start+len, sizeof(Addr))' failed
 353917  unhandled amd64-solaris syscall fchdir(120)
diff --git a/coregrind/m_addrinfo.c b/coregrind/m_addrinfo.c
index 8c39b47b5b..7b1c4cfe84 100644
--- a/coregrind/m_addrinfo.c
+++ b/coregrind/m_addrinfo.c
@@ -463,7 +463,7 @@ static void pp_addrinfo_WRK ( Addr a, const AddrInfo* ai, Bool mc,
             hasfn = VG_(get_fnname)(ai->Addr.Stack.IP, &fn);
 
             if (hasfn || hasfile)
-               VG_(emit)( "%sin frame #%d, created by %s (%s:%s)%s\n",
+               VG_(emit)( "%sin frame #%d, created by %ps (%ps:%s)%s\n",
                           xpre,
                           ai->Addr.Stack.frameNo, 
                           hasfn ? fn : "???", 
@@ -573,7 +573,7 @@ static void pp_addrinfo_WRK ( Addr a, const AddrInfo* ai, Bool mc,
 
       case Addr_DataSym:
          VG_(emit)( "%sAddress 0x%lx is %llu bytes "
-                    "inside data symbol \"%pS\"%s\n",
+                    "inside data symbol \"%ps\"%s\n",
                     xpre, a,
                     (ULong)ai->Addr.DataSym.offset,
                     ai->Addr.DataSym.name,
@@ -595,7 +595,7 @@ static void pp_addrinfo_WRK ( Addr a, const AddrInfo* ai, Bool mc,
          break;
 
       case Addr_SectKind:
-         VG_(emit)( "%sAddress 0x%lx is in the %pS segment of %pS%s\n",
+         VG_(emit)( "%sAddress 0x%lx is in the %ps segment of %ps%s\n",
                     xpre, a,
                     VG_(pp_SectKind)(ai->Addr.SectKind.kind),
                     ai->Addr.SectKind.objname,
@@ -627,7 +627,7 @@ static void pp_addrinfo_WRK ( Addr a, const AddrInfo* ai, Bool mc,
 
       case Addr_SegmentKind:
          VG_(emit)( "%sAddress 0x%lx is in "
-                    "a %s%s%s %s%s%pS segment%s\n",
+                    "a %s%s%s %s%s%ps segment%s\n",
                     xpre,
                     a,
                     ai->Addr.SegmentKind.hasR ? "r" : "-",