projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1406659
)
Fixed alignment check in QJsonDocument::fromRawData
author
Denis Dzyubenko
<denis.dzyubenko@nokia.com>
Wed, 8 Feb 2012 22:01:05 +0000
(23:01 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 10 Feb 2012 18:32:30 +0000
(19:32 +0100)
Change-Id: I1d107e26a77e40f91ff09d43e9529b08da8f7c3b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/json/qjsondocument.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/json/qjsondocument.cpp
b/src/corelib/json/qjsondocument.cpp
index
98a0b8c
..
5ae1bcb
100644
(file)
--- 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() <<"QJsonDocum
e
nt::fromRawData: data has to have 4 byte alignment";
return QJsonDocument();
}