From: Eugene V. Lyubimkin <jackyf@1501-debian>
Date: Sat, 25 Oct 2008 19:49:22 +0000 (+0300)
Subject: Corrected determining if regexp matched.
X-Git-Tag: 0.7.21~76^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2d6f9accbcf38923911854a918d971c0905b262c

Corrected determining if regexp matched.
---

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index bd59a4749..6f30a52da 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1348,8 +1348,8 @@ bool ListUpdate(pkgAcquireStatus &Stat,
 	  regex_t userPassRegex;
 	  regcomp(&userPassRegex, "\\://(\\w+)\\:(\\w+)@", REG_EXTENDED);
 	  regmatch_t userPassMatch;
-	  regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0);
-	  if (userPassMatch.rm_so != -1) // regexp matched
+	  int regMatchResult = regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0);
+	  if (regMatchResult == 0 && userPassMatch.rm_so != -1) // regexp matched
 	  {
          // really stripping
 		 size_t stripStart = userPassMatch.rm_so + 3;
@@ -1357,6 +1357,7 @@ bool ListUpdate(pkgAcquireStatus &Stat,
 		 descUri = descUri.substr(0, stripStart) +
             descUri.substr(stripEnd, string::npos);
       }
+      regfree(&userPassRegex);
 
       _error->Warning(_("Failed to fetch %s  %s\n"), descUri.c_str(),
 	      (*I)->ErrorText.c_str());