diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-07 15:29:44 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 13:46:52 +0000 |
| commit | 7a8a62729f94a91cb1b80b1f6fb219766776ddd8 (patch) | |
| tree | 3506fa611b984b49f4ab91f5ad56b3d9b0fd365a /src/linguist/shared/qmakeparser.cpp | |
| parent | 909106abfb382ba027bc4d4f393b585b4c43e554 (diff) | |
qmake: fix UB in QMakeParser::putHashStr()
Found by UBSan:
qmake/library/qmakeparser.cpp:278:33: runtime error: null pointer passed as argument 2, which is declared to never be null
Guard the call.
Change-Id: I99341ab439a511f366dae9344ddcc8727c33b9b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/1fd0d57ce3da83631423d17faadf97133f5c7835)
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/linguist/shared/qmakeparser.cpp')
| -rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index 48e2f5a54..0e2468446 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -280,7 +280,8 @@ void QMakeParser::putHashStr(ushort *&pTokPtr, const ushort *buf, uint len) *tokPtr++ = (ushort)hash; *tokPtr++ = (ushort)(hash >> 16); *tokPtr++ = (ushort)len; - memcpy(tokPtr, buf, len * 2); + if (len) // buf may be nullptr; don't pass that to memcpy (-> undefined behavior) + memcpy(tokPtr, buf, len * 2); pTokPtr = tokPtr + len; } |