diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-22 17:27:55 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-22 17:27:55 +0200 |
| commit | 2db5c8e7f1cf88d7bb570e04be0443dd8aad57a7 (patch) | |
| tree | 8a953305b2af00b8789e37cc27bcdb00bef6de6e | |
| parent | 2bde2334b3be5279d044fe552d0ff5ce38db1763 (diff) | |
cherry pick from lp:~mvo/apt/mvo
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4fed33ae3..cac4ea361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,12 +112,17 @@ apt (0.8.16~exp5ubuntu1) oneiric; urgency=low apt (0.8.16~exp5) UNRELEASED; urgency=low + [ Michael Vogt ] * apt-pkg/makefile: - install sha256.h compat header * apt-pkg/pkgcachegen.{cc,h}: - use ref-to-ptr semantic in NewDepends() to ensure that the libapt does not segfault if the cache is remapped in between (LP: #812862) + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 13:44:01 +0200 diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 7e4c2e9fe..080c2bbcc 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -297,7 +297,7 @@ bool CacheDB::LoadContents(bool const &GenOnly) /*}}}*/ static string bytes2hex(uint8_t *bytes, size_t length) { - char space[65]; + char space[129]; if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2; for (size_t i = 0; i < length; i++) snprintf(&space[i*2], 3, "%02x", bytes[i]); |