summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsondocument.cpp
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2012-02-08 23:01:05 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-10 19:32:30 +0100
commit9633459274f99487360bcc7c7e7c593c4ac98ce2 (patch)
treea9a6027017cc5611ae2e9e3ba367dbee0c1568a9 /src/corelib/json/qjsondocument.cpp
parent1406659948c226ef663e9dca7728958b9ad5023c (diff)
Fixed alignment check in QJsonDocument::fromRawData
Change-Id: I1d107e26a77e40f91ff09d43e9529b08da8f7c3b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/json/qjsondocument.cpp')
-rw-r--r--src/corelib/json/qjsondocument.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp
index 98a0b8c3d3..5ae1bcbe4e 100644
--- a/src/corelib/json/qjsondocument.cpp
+++ b/src/corelib/json/qjsondocument.cpp
@@ -179,8 +179,8 @@ QJsonDocument &QJsonDocument::operator =(const QJsonDocument &other)
*/
QJsonDocument QJsonDocument::fromRawData(const char *data, int size, DataValidation validation)
{
- if (!(((quintptr)validation) & ~3)) {
- qWarning() <<"QJsonDocumnt::fromRawData: data has to have 4 byte alignment";
+ if (quintptr(data) & 3) {
+ qWarning() <<"QJsonDocument::fromRawData: data has to have 4 byte alignment";
return QJsonDocument();
}