Fix segfault in FindAny when /i is used, and there is n...

Author: doogie
Date: 2002-11-09 19:52:03 GMT
Fix segfault in FindAny when /i is used, and there is no default.

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 18d6cd9ab070a91804f7d29e07d3eecf514764bb..b0d705b075afd2ffaefac4b34df60e66caa755dc 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.cc,v 1.24 2002/11/09 17:11:25 doogie Exp $
+// $Id: configuration.cc,v 1.25 2002/11/09 19:52:03 doogie Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -282,7 +282,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
       case 'i': 
       {
         char buf[16];
       case 'i': 
       {
         char buf[16];

-        snprintf(buf, sizeof(buf)-1, "%d", FindI(key, atoi(Default)));
+        snprintf(buf, sizeof(buf)-1, "%d", FindI(key, Default ? atoi(Default) : 0 ));

         return buf;
       }
    }
         return buf;
       }
    }

diff --git a/debian/changelog b/debian/changelog
index 7caad06f5fbf5b8e0625d337c7e2ee3c292a2371..518e7e8811f1d30af5e5d7ee7d32f52794239b18 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ apt (0.5.5) unstable; urgency=low
   * Some highly unlikely memory faults. Closes: #155842
   * C++ stuff for G++3.2. Closes: #162617
   * apt-config dumps sends to stdout not stderr now.  Closes: #146294
   * Some highly unlikely memory faults. Closes: #155842
   * C++ stuff for G++3.2. Closes: #162617
   * apt-config dumps sends to stdout not stderr now.  Closes: #146294

+  * Fix segfault in FindAny when /i is used, and there is no default.
+    Closes: #165891

 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600
 
 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600