* merged apt--no-pragma

[apt.git] / apt-pkg / deb / debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 21d7392a0da6c726095b0ad03f16d392c22128b6..7338de15dd483643d9ab1b0b380d2b7278507953 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -14,6 +14,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

+
+using std::max;

                                                                        /*}}}*/
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
                                                                        /*}}}*/
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/


@@ -30,31 +32,19 @@ const char **debSrcRecordParser::Binaries()
    if (Bins.empty() == true || Bins.length() >= 102400)
       return 0;
    
    if (Bins.empty() == true || Bins.length() >= 102400)
       return 0;
    

-   // Workaround for #236688.  Only allocate a new buffer if the field
-   // is large, to avoid a performance penalty
-   char *BigBuf = NULL;
-   char *Buf;
-   if (Bins.length() > sizeof(Buffer))
-   {
-      BigBuf = new char[Bins.length()];
-      Buf = BigBuf;
-   }
-   else
+   if (Bins.length() >= BufSize)

    {
    {

-      Buf = Buffer;
+      delete [] Buffer;
+      // allocate new size based on buffer (but never smaller than 4000)
+      BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize));
+      Buffer = new char[BufSize];

    }
 
    }
 

-   strcpy(Buf,Bins.c_str());
-   if (TokSplitString(',',Buf,StaticBinList,
+   strcpy(Buffer,Bins.c_str());
+   if (TokSplitString(',',Buffer,StaticBinList,

                      sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
                      sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)

-   {
-      if (BigBuf != NULL)
-         delete BigBuf;

       return 0;
       return 0;

-   }

 
 

-   if (BigBuf != NULL)
-      delete BigBuf;

    return (const char **)StaticBinList;
 }
                                                                        /*}}}*/
    return (const char **)StaticBinList;
 }
                                                                        /*}}}*/