debian/apt.cron.daily: add missing check_size_constrains

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index d452095cd5296709f657ec1bad86dc838b903655..ace4e00b58560295700d8c82470fcb7f77c1f1bd 100644 (file)
--- 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.4 2001/02/20 07:03:17 jgg Exp $
+// $Id: debsrcrecords.cc,v 1.6 2004/03/17 05:58:54 mdz Exp $
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
@@ -9,15 +9,13 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debsrcrecords.h"
-#endif 
-
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debsrcrecords.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               /*{{{*/
@@ -31,13 +29,22 @@ 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;
    
+   if (Bins.length() >= BufSize)
+   {
+      delete [] Buffer;
+      // allocate new size based on buffer (but never smaller than 4000)
+      BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize));
+      Buffer = new char[BufSize];
+   }
+
    strcpy(Buffer,Bins.c_str());
    if (TokSplitString(',',Buffer,StaticBinList,
                      sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
       return 0;
+
    return (const char **)StaticBinList;
 }
                                                                        /*}}}*/
@@ -47,7 +54,7 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps)
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
 {
    unsigned int I;
    const char *Start, *Stop;
@@ -61,6 +68,9 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
 
    for (I = 0; I < 4; I++) 
    {
+      if (ArchOnly && (I == 1 || I == 3))
+         continue;
+
       if (Sect.Find(fields[I], Start, Stop) == false)
          continue;
       
@@ -127,7 +137,7 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
            break;
         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         
-        if (F.Type == "gz" || F.Type == "bz2")
+        if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma")
         {
            Pos = Tmp-1;
            continue;