* Patch from Jason Gunthorpe to remove arbitrary length...

Author: mdz
Date: 2004-03-24 01:40:43 GMT
* Patch from Jason Gunthorpe to remove arbitrary length limit on Binary
field in SourcesWriter::DoPackage

diff --git a/debian/changelog b/debian/changelog
index 2b934db99a09f90c3b28811f66e435e5bf62d8b4..de381eee789bc0a7ba057718967bf340e4f7bc70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apt (0.5.25) unstable; urgency=low
   * Fix typo in apt-cache(8) (Closes: #238578)
   * Updated Swedish translation from Peter Karlsson  <peter@softwolves.pp.se>
     (Closes: #238943)
   * Fix typo in apt-cache(8) (Closes: #238578)
   * Updated Swedish translation from Peter Karlsson  <peter@softwolves.pp.se>
     (Closes: #238943)

+  * Patch from Jason Gunthorpe to remove arbitrary length limit on Binary
+    field in SourcesWriter::DoPackage

 
  --
 
 
  --
 

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index bc03492f433b3f8c857e83dba3a3f2aaf19c6ce8..e1fd33ad388612128b1754fac86ef36149d89766 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: writer.cc,v 1.13 2004/01/04 00:20:59 mdz Exp $
+// $Id: writer.cc,v 1.14 2004/03/24 01:40:43 mdz Exp $

 /* ######################################################################
 
    Writer 
 /* ######################################################################
 
    Writer 


@@ -555,10 +555,10 @@ bool SourcesWriter::DoPackage(string FileName)
       
    // Lookup the overide information, finding first the best priority.
    string BestPrio;
       
    // Lookup the overide information, finding first the best priority.
    string BestPrio;

-   char Buffer[1000];

    string Bins = Tags.FindS("Binary");
    string Bins = Tags.FindS("Binary");

+   char Buffer[Bins.length() + 1];

    Override::Item *OverItem = 0;
    Override::Item *OverItem = 0;

-   if (Bins.empty() == false && Bins.length() < sizeof(Buffer))
+   if (Bins.empty() == false)

    {
       strcpy(Buffer,Bins.c_str());
       
    {
       strcpy(Buffer,Bins.c_str());