From c33b707e5dbfced74e5dd02f663bc88210ddb94b Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:06:06 +0000
Subject: * Implement an ugly workaround for the 10000-character ... Author:
 mdz Date: 2004-03-17 05:58:54 GMT * Implement an ugly workaround for the
 10000-character limit on the Binaries field in debSrcRecordParser, until such
 time as some things can be converted over to use STL data types (ABI change)
 (Closes: #236688) * Increase default tagfile buffer from 32k to 128k; this
 arbitrary limit should also be removed someday (Closes: #174945)

---
 apt-pkg/deb/debsrcrecords.cc | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'apt-pkg/deb/debsrcrecords.cc')

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 639079be3..cac36c2e6 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: debsrcrecords.cc,v 1.5 2001/11/04 17:09:18 tausq Exp $
+// $Id: debsrcrecords.cc,v 1.6 2004/03/17 05:58:54 mdz Exp $
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
@@ -31,13 +31,34 @@ const char **debSrcRecordParser::Binaries()
 {
    // This should use Start/Stop too, it is supposed to be efficient after all.
    string Bins = Sect.FindS("Binary");
-   if (Bins.empty() == true || Bins.length() >= sizeof(Buffer))
+   if (Bins.empty() == true || Bins.length() >= 102400)
       return 0;
    
-   strcpy(Buffer,Bins.c_str());
-   if (TokSplitString(',',Buffer,StaticBinList,
+   // 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
+   {
+      Buf = Buffer;
+   }
+
+   strcpy(Buf,Bins.c_str());
+   if (TokSplitString(',',Buf,StaticBinList,
 		      sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
+   {
+      if (BigBuf != NULL)
+         delete BigBuf;
       return 0;
+   }
+
+   if (BigBuf != NULL)
+      delete BigBuf;
    return (const char **)StaticBinList;
 }
 									/*}}}*/
-- 
cgit v1.2.3-70-g09d2