diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-08-31 10:11:07 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-10-05 21:53:38 +0200 |
| commit | 3b4a7c7da916ad9584af34d535ebac37f3b338a0 (patch) | |
| tree | a55f2ddbe5c2880bb50611c6d426db5b344f5c75 /apt-pkg/contrib/hashes.cc | |
| parent | 2ce2ada40aa93ca5d31fb9dd0ca8d78df5751227 (diff) | |
try not to call memcpy with length 0 in hash calculations
memcpy is marked as nonnull for its input, but ignores the input anyhow
if the declared length is zero. Our SHA2 implementations do this as
well, it was "just" MD5 and SHA1 missing, so we add the length check
here as well as along the callstack as it is really pointless to do all
these method calls for "nothing".
Reported-By: gcc -fsanitize=undefined
(cherry picked from commit 644478e8db56f305601c3628a74e53de048b28c8)
Diffstat (limited to 'apt-pkg/contrib/hashes.cc')
| -rw-r--r-- | apt-pkg/contrib/hashes.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 755ad2035..662c2bf8b 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -312,6 +312,8 @@ public: // Hashes::Add* - Add the contents of data or FD /*{{{*/ bool Hashes::Add(const unsigned char * const Data, unsigned long long const Size) { + if (Size == 0) + return true; bool Res = true; APT_IGNORE_DEPRECATED_PUSH if ((d->CalcHashes & MD5SUM) == MD5SUM) |