diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-31 17:18:07 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-10-05 21:53:38 +0200 |
| commit | 2ce2ada40aa93ca5d31fb9dd0ca8d78df5751227 (patch) | |
| tree | 9f537204e527508dc78897126617c58d952737a5 /apt-pkg/contrib | |
| parent | 43ed244f35c0bbd3bec2dae0d5e71d98f6314d23 (diff) | |
Base256ToNum: Fix uninitialized value
If the inner Base256ToNum() returned false, it did not set
Num to a new value, causing it to be uninitialized, and thus
might have caused the function to exit despite a good result.
Also document why the Res = Num, if (Res != Num) magic is done.
Reported-By: valgrind
(cherry picked from commit cf7503d8a09ebce695423fdeb2402c456c18f3d8)
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ebde6b20d..26e303263 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1090,10 +1090,11 @@ bool Base256ToNum(const char *Str,unsigned long long &Res,unsigned int Len) tar files */ bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len) { - unsigned long long Num; + unsigned long long Num = 0; bool rc; rc = Base256ToNum(Str, Num, Len); + // rudimentary check for overflow (Res = ulong, Num = ulonglong) Res = Num; if (Res != Num) return false; |