* apt-pkg/sourcelist.cc:

  - fix segfault when a hostname contains a [, thanks to
    Tzafrir Cohen (closes: #704653)

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 0fddfb45134ada915dfd445c5aa5e5ec4c132ded..0fd237cadaffe91ffeed735d2169e2b76a1aef18 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -270,7 +270,11 @@ bool pkgSourceList::ReadAppend(string File)
       // CNC:2003-02-20 - Do not break if '#' is inside [].
       for (I = Buffer; *I != 0 && *I != '#'; I++)
          if (*I == '[')
       // CNC:2003-02-20 - Do not break if '#' is inside [].
       for (I = Buffer; *I != 0 && *I != '#'; I++)
          if (*I == '[')

-           I = strchr(I + 1, ']');
+         {
+           char *b_end = strchr(I + 1, ']');
+            if (b_end != NULL)
+               I = b_end;
+         }

       *I = 0;
       
       const char *C = _strstrip(Buffer);
       *I = 0;
       
       const char *C = _strstrip(Buffer);

diff --git a/debian/changelog b/debian/changelog
index 42874ac53f09a2932e205dcb878fbd5629e83e03..5701cfeb0bf67528e8f915206bb80c29655f6e45 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.9.7.9~exp3) UNRELEASED; urgency=low
+
+  * apt-pkg/sourcelist.cc:
+    - fix segfault when a hostname contains a [, thanks to 
+      Tzafrir Cohen (closes: #704653)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 04 Apr 2013 18:21:06 +0200
+

 apt (0.9.7.9~exp2) experimental; urgency=low
 
   [ Programs translations ]
 apt (0.9.7.9~exp2) experimental; urgency=low
 
   [ Programs translations ]