diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-22 22:24:27 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-22 22:24:27 +0200 |
| commit | fbe0969131dc2472bcefbceaf390015ba68e1327 (patch) | |
| tree | 8a559e599f2284f97e93ffbea3db24c24c567b6a /apt-pkg/contrib | |
| parent | 85988543cb4692571a754818a56cd0fd1c27d5a9 (diff) | |
| parent | 70e0c1683e7021a0682b0808b329a3cced3920ac (diff) | |
Merge remote-tracking branch 'mvo/bugfix/coverity' into debian/sid
Conflicts:
apt-pkg/tagfile.h
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cmndline.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 8cef80368..2086d91ca 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -397,6 +397,7 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv) { char cmdline[100 + argc * 50]; + memset(cmdline, 0, sizeof(cmdline)); unsigned int length = 0; bool lastWasOption = false; bool closeQuote = false; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index d06637155..0955b69f7 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -943,6 +943,8 @@ bool StrToTime(const string &Val,time_t &Result) Tm.tm_isdst = 0; if (Month[0] != 0) Tm.tm_mon = MonthConv(Month); + else + Tm.tm_mon = 0; // we don't have a month, so pick something Tm.tm_year -= 1900; // Convert to local time and then to GMT |