cherry pick from lp:~mvo/apt/mvo

diff --git a/debian/changelog b/debian/changelog
index 4fed33ae3d17b95141399a3c09b3b8eeea0d17d2..cac4ea36141a84f1e23f0a03a8c2a17c8450895c 100644 (file)
--- 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
 
 
 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)
   * 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
 
 
  -- 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 7e4c2e9fec82320baa16ea2739ff6e553dd2412f..080c2bbcc1a2c5de62bfb0032cb85c77481337fc 100644 (file)
--- 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) {
                                                                        /*}}}*/
 
 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]);
    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]);