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

Fix undefined behavior in ProString/ProKey::appendTo

Browse Source 
We must not pass null pointers to memcpy.

Fixes: QTBUG-88780
Change-Id: Ic1d77b4672310a3f6d0d4fbee5f2889e3e4d219d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 21e77772309df0f2c3fc15f16f9a95214d13f91c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2020-12-01 16:30:54 +01:00 committed by Qt Cherry-pick Bot
parent 676b912cf9
commit 96ea154b0f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/library/proitems.h
View File

@ -233,6 +233,8 @@ template <> struct QConcatenable<ProString> : private QAbstractConcatenable
static inline void appendTo(const ProString &a, QChar *&out) static inline void appendTo(const ProString &a, QChar *&out)
{ {
const auto n = a.size(); const auto n = a.size();
if (!n)
return;
memcpy(out, a.toQStringView().data(), sizeof(QChar) * n); memcpy(out, a.toQStringView().data(), sizeof(QChar) * n);
out += n; out += n;
} }
@ -247,6 +249,8 @@ template <> struct QConcatenable<ProKey> : private QAbstractConcatenable
static inline void appendTo(const ProKey &a, QChar *&out) static inline void appendTo(const ProKey &a, QChar *&out)
{ {
const auto n = a.size(); const auto n = a.size();
if (!n)
return;
memcpy(out, a.toQStringView().data(), sizeof(QChar) * n); memcpy(out, a.toQStringView().data(), sizeof(QChar) * n);
out += n; out += n;
} }