From 9633459274f99487360bcc7c7e7c593c4ac98ce2 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 8 Feb 2012 23:01:05 +0100 Subject: [PATCH] Fixed alignment check in QJsonDocument::fromRawData Change-Id: I1d107e26a77e40f91ff09d43e9529b08da8f7c3b Reviewed-by: Lars Knoll --- src/corelib/json/qjsondocument.cpp | 4 ++-- 1 file 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(); }