2 files changed, 3 insertions, 21 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 0c98ff304..554307324 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -861,26 +861,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
       // The input line with comments stripped.
       std::string Fragment;
 
-      // Expand tabs in the input line and remove leading and trailing
-      // whitespace.
-      {
-	const int BufferSize = Input.size() * 8 + 1;
-	char *Buffer = new char[BufferSize];
-	try
-	  {
-	    memcpy(Buffer, Input.c_str(), Input.size() + 1);
-
-	    _strtabexpand(Buffer, BufferSize);
-	    _strstrip(Buffer);
-	    Input = Buffer;
-	  }
-	catch(...)
-	  {
-	    delete[] Buffer;
-	    throw;
-	  }
-	delete[] Buffer;
-      }
+      // Expand tabs in the input line and remove leading and trailing whitespace.
+      Input = APT::String::Strip(SubstVar(Input, "\t", "        "));
       CurLine++;
 
       // Now strip comments; if the whole line is contained in a
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index c25c6208a..8669c97a5 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -42,7 +42,7 @@ namespace APT {
 APT_PUBLIC bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 APT_PUBLIC char *_strstrip(char *String);
 APT_PUBLIC char *_strrstrip(char *String); // right strip only
-APT_PUBLIC char *_strtabexpand(char *String,size_t Len);
+APT_DEPRECATED_MSG("Use SubstVar to avoid memory headaches") APT_PUBLIC char *_strtabexpand(char *String,size_t Len);
 APT_PUBLIC bool ParseQuoteWord(const char *&String,std::string &Res);
 APT_PUBLIC bool ParseCWord(const char *&String,std::string &Res);
 APT_PUBLIC std::string QuoteString(const std::string &Str,const char *Bad);