summaryrefslogtreecommitdiffstats
path: root/src/xmldocvisitor.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-01-06 11:31:51 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-01-06 11:31:51 (GMT)
commita53d5b44731b55197d7ff2ae046552374d011e59 (patch)
treea1ae128f2c331230f7be24db5704a8f3cb46fe85 /src/xmldocvisitor.cpp
parentde34e6c26eeb0dca1b1a6aa8bf26d21bb3fd644f (diff)
downloadDoxygen-a53d5b44731b55197d7ff2ae046552374d011e59.zip
Doxygen-a53d5b44731b55197d7ff2ae046552374d011e59.tar.gz
Doxygen-a53d5b44731b55197d7ff2ae046552374d011e59.tar.bz2
issue #6744 Ampersand in Markdown image URL is not escaped in XML output
Convert name / url based on HTML / XML conventions and don't do double conversions (XML).
Diffstat (limited to 'src/xmldocvisitor.cpp')
-rw-r--r--src/xmldocvisitor.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index e464088..01e0a6d 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -60,7 +60,7 @@ static void visitPreStart(FTextStream &t, const char *cmd, bool doCaption,
}
if (!name.isEmpty())
{
- t << " name=\"" << name << "\"";
+ t << " name=\"" << convertToXML(name, TRUE) << "\"";
}
if (!width.isEmpty())
{
@@ -770,9 +770,7 @@ void XmlDocVisitor::visitPost(DocInternal *)
void XmlDocVisitor::visitPre(DocHRef *href)
{
if (m_hide) return;
- m_t << "<ulink url=\"";
- filter(href->url());
- m_t << "\">";
+ m_t << "<ulink url=\"" << convertToXML(href->url(), TRUE) << "\">";
}
void XmlDocVisitor::visitPost(DocHRef *)