diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-07 15:29:44 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-02 07:54:13 +0000 |
| commit | bbb353b113277760790fe82a6b2c065c0ab51dec (patch) | |
| tree | 2f88ef0e7b15a640365acf07e417885ebf4eb369 /src | |
| parent | 73fead33dcb406a01f1ab91777546a329c056b54 (diff) | |
| download | qt-creator-bbb353b113277760790fe82a6b2c065c0ab51dec.tar.gz | |
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')
| -rw-r--r-- | src/shared/proparser/qmakeparser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeparser.cpp b/src/shared/proparser/qmakeparser.cpp index 59dc289548..f22d47450a 100644 --- a/src/shared/proparser/qmakeparser.cpp +++ b/src/shared/proparser/qmakeparser.cpp @@ -272,7 +272,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; } |