From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 3 May 2016 21:22:53 +0000 (+0200)
Subject: allow redirection for items without a space in the desc again
X-Git-Tag: 1.3_exp1~18
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/84ac6edfabe1c92d67e8d441e04216ad33c89165

allow redirection for items without a space in the desc again

Broken in a4b8112b19763cbd2c12b81d55bc7d43a591d610.
If an item has a description which includes no space and is redirected
to another mirror the code which wants to rewrite the description
expects a space in there, but can't find it and the unguarded substr
command on the string will fail with an exception thrown…

Guarding it properly and everything is fine.
---

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 69ca6a28e..2ad0eda7f 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -273,16 +273,19 @@ bool pkgAcquire::Worker::RunMessages()
 	       // if we change site, treat it as a mirror change
 	       if (URI::SiteOnly(NewURI) != URI::SiteOnly(desc.URI))
 	       {
-		  std::string const OldSite = desc.Description.substr(0, desc.Description.find(" "));
-		  if (likely(APT::String::Startswith(desc.URI, OldSite)))
+		  auto const firstSpace = desc.Description.find(" ");
+		  if (firstSpace != std::string::npos)
 		  {
-		     std::string const OldExtra = desc.URI.substr(OldSite.length() + 1);
-		     if (likely(APT::String::Endswith(NewURI, OldExtra)))
+		     std::string const OldSite = desc.Description.substr(0, firstSpace);
+		     if (likely(APT::String::Startswith(desc.URI, OldSite)))
 		     {
-			std::string const NewSite = NewURI.substr(0, NewURI.length() - OldExtra.length());
-			Owner->UsedMirror = URI::ArchiveOnly(NewSite);
-			if (desc.Description.find(" ") != string::npos)
-			   desc.Description.replace(0, desc.Description.find(" "), Owner->UsedMirror);
+			std::string const OldExtra = desc.URI.substr(OldSite.length() + 1);
+			if (likely(APT::String::Endswith(NewURI, OldExtra)))
+			{
+			   std::string const NewSite = NewURI.substr(0, NewURI.length() - OldExtra.length());
+			   Owner->UsedMirror = URI::ArchiveOnly(NewSite);
+			   desc.Description.replace(0, firstSpace, Owner->UsedMirror);
+			}
 		     }
 		  }
 	       }
diff --git a/test/integration/test-handle-redirect-as-used-mirror-change b/test/integration/test-handle-redirect-as-used-mirror-change
index e9370930a..f4a240323 100755
--- a/test/integration/test-handle-redirect-as-used-mirror-change
+++ b/test/integration/test-handle-redirect-as-used-mirror-change
@@ -37,3 +37,6 @@ Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/source/Sources.gz
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/binary-all/Packages.gz
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/i18n/Translation-en.gz" grep '^Location:' aptarchive/webserver.log
+
+testsuccess apthelper download-file "http://localhost:${APTHTTPPORT}/redirectme/dists/unstable/InRelease" inrelease
+testsuccess test -s inrelease