* apt-pkg/contrib/strutl.cc:

  - fix malloc asseration fail with ja_JP.eucJP locale in
    apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 4c05f2df880a2200f7872d863fbdeef425f4dd75..2913fbf44e42f74bf8104cb5b97051816c0940d7 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -43,9 +43,10 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
 {
   iconv_t cd;
   const char *inbuf;
 {
   iconv_t cd;
   const char *inbuf;

-  char *inptr, *outbuf, *outptr;
-  size_t insize, outsize;
-  
+  char *inptr, *outbuf;
+  size_t insize, bufsize;
+  dest->clear();
+

   cd = iconv_open(codeset, "UTF-8");
   if (cd == (iconv_t)(-1)) {
      // Something went wrong
   cd = iconv_open(codeset, "UTF-8");
   if (cd == (iconv_t)(-1)) {
      // Something went wrong


@@ -55,33 +56,49 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
      else
        perror("iconv_open");
      
      else
        perror("iconv_open");
      

-     // Clean the destination string
-     *dest = "";
-     

      return false;
   }
 
      return false;
   }
 

-  insize = outsize = orig.size();
+  insize = bufsize = orig.size();

   inbuf = orig.data();
   inptr = (char *)inbuf;
   inbuf = orig.data();
   inptr = (char *)inbuf;

-  outbuf = new char[insize+1];
-  outptr = outbuf;
+  outbuf = new char[bufsize];
+  size_t lastError = -1;

 
   while (insize != 0)
   {
 
   while (insize != 0)
   {

+     char *outptr = outbuf;
+     size_t outsize = bufsize;

      size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize);
      size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize);

+     dest->append(outbuf, outptr - outbuf);

      if (err == (size_t)(-1))
      {
      if (err == (size_t)(-1))
      {

-       insize--;
-       outsize++;
-       inptr++;
-       *outptr = '?';
-       outptr++;
+       switch (errno)
+       {
+       case EILSEQ:
+          insize--;
+          inptr++;
+          // replace a series of unknown multibytes with a single "?"
+          if (lastError != insize) {
+             lastError = insize - 1;
+             dest->append("?");
+          }
+          break;
+       case EINVAL:
+          insize = 0;
+          break;
+       case E2BIG:
+          if (outptr == outbuf)
+          {
+             bufsize *= 2;
+             delete[] outbuf;
+             outbuf = new char[bufsize];
+          }
+          break;
+       }

      }
   }
 
      }
   }
 

-  *outptr = '\0';
-  *dest = outbuf;

   delete[] outbuf;
   
   iconv_close(cd);
   delete[] outbuf;
   
   iconv_close(cd);

diff --git a/debian/changelog b/debian/changelog
index 588038b4cca4145d66023101aa6ff88032701b0c..9a88f084a14a5acc4d86376a8c9c0ff6324457e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ apt (0.7.25.2) UNRELEASED; urgency=low
     - replace the per language addendum with a global addendum
     - add a explanation why translations include (maybe) english
       parts to the new global addendum (Closes: #561636)
     - replace the per language addendum with a global addendum
     - add a explanation why translations include (maybe) english
       parts to the new global addendum (Closes: #561636)

+  * apt-pkg/contrib/strutl.cc:
+    - fix malloc asseration fail with ja_JP.eucJP locale in
+      apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jan 2010 21:06:38 +0100
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jan 2010 21:06:38 +0100