1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QXmlStreamReader: early return in case of malformed attributes

Browse Source 
There's no point at keep raising errors after encountering the
first malformed attribute.

Change-Id: Idb37e577ea96c3bd850b3caf008fe3ecd57dd32e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2020-01-15 20:53:21 +01:00
parent 474a5e2f3f
commit 4d8a515a23
3 changed files with 9010 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/serialization/qxmlstream.cpp
View File

@ -50,6 +50,7 @@
#endif #endif
#include <qstack.h> #include <qstack.h>
#include <qbuffer.h> #include <qbuffer.h>
#include <qscopeguard.h>
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
#include <qcoreapplication.h> #include <qcoreapplication.h>
#else #else
@ -1582,6 +1583,7 @@ QStringRef QXmlStreamReaderPrivate::namespaceForPrefix(const QStringRef &prefix)
*/ */
void QXmlStreamReaderPrivate::resolveTag() void QXmlStreamReaderPrivate::resolveTag()
{ {
const auto attributeStackCleaner = qScopeGuard([this](){ attributeStack.clear(); });
int n = attributeStack.size(); int n = attributeStack.size();
if (namespaceProcessing) { if (namespaceProcessing) {
@ -1649,7 +1651,10 @@ void QXmlStreamReaderPrivate::resolveTag()
if (attributes[j].name() == attribute.name() if (attributes[j].name() == attribute.name()
&& attributes[j].namespaceUri() == attribute.namespaceUri() && attributes[j].namespaceUri() == attribute.namespaceUri()
&& (namespaceProcessing || attributes[j].qualifiedName() == attribute.qualifiedName())) && (namespaceProcessing || attributes[j].qualifiedName() == attribute.qualifiedName()))
{
raiseWellFormedError(QXmlStream::tr("Attribute '%1' redefined.").arg(attribute.qualifiedName())); raiseWellFormedError(QXmlStream::tr("Attribute '%1' redefined.").arg(attribute.qualifiedName()));
return;
}
} }
} }
@ -1680,8 +1685,6 @@ void QXmlStreamReaderPrivate::resolveTag()
attribute.m_isDefault = true; attribute.m_isDefault = true;
attributes.append(attribute); attributes.append(attribute);
} }
attributeStack.clear();
} }
void QXmlStreamReaderPrivate::resolvePublicNamespaces() void QXmlStreamReaderPrivate::resolvePublicNamespaces()

8003
tests/auto/corelib/serialization/qxmlstream/data/duplicatedattributes.ref Normal file
View File

File diff suppressed because it is too large Load Diff

1002
tests/auto/corelib/serialization/qxmlstream/data/duplicatedattributes.xml Normal file
View File

File diff suppressed because it is too large Load Diff