diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2016-10-25 11:43:56 +0200 |
|---|---|---|
| committer | Jesus Fernandez <jesus.fernandez@qt.io> | 2016-10-25 21:22:52 +0000 |
| commit | b82793e7909d38482662a8de0f16d8ab0df232ec (patch) | |
| tree | 8ab4307be152e05988a5ecff4b30d55e4585ba5c /qmake | |
| parent | 0cffe2135e7303bd103bdf888a345fe0a8b94cd6 (diff) | |
Fix possible loss of data in conversion from size_t to int warning
Change-Id: I72c74e67708f1e164a0c35e1e92d9bf3ec99ffd6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index ff613ea8f1..65f401affd 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -50,6 +50,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <limits.h> #if defined(_MSC_VER) && _MSC_VER >= 1400 #include <share.h> #endif @@ -983,9 +984,11 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file) continue; int matchlen = 0, extralines = 0; + size_t needle_len = strlen(interesting[interest]); + Q_ASSERT(needle_len <= INT_MAX); if (matchWhileUnsplitting(buffer, buffer_len, y, interesting[interest], - strlen(interesting[interest]), + static_cast<int>(needle_len), &matchlen, &extralines) && y + matchlen < buffer_len && !isCWordChar(buffer[y + matchlen])) { |