Pārlūkot izejas kodu

fix crash when LANGUAGE is not set

Michael Vogt 16 gadi atpakaļ
vecāks
revīzija
a100bb98ea
2 mainītis faili ar 8 papildinājumiem un 1 dzēšanām
  1. 2 1
      apt-pkg/aptconfiguration.cc
  2. 6 0
      debian/changelog

+ 2 - 1
apt-pkg/aptconfiguration.cc

@@ -217,7 +217,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 		environment.push_back(envLong);
 	environment.push_back(envShort);
 	// take care of LANGUAGE
-	string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1);
+	const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
+	string envLang = Locale == 0 ? language_env : *(Locale+1);
 	if (envLang.empty() == false) {
 		std::vector<string> env = ExplodeString(envLang,':');
 		short addedLangs = 0; // add a maximum of 3 fallbacks from the environment

+ 6 - 0
debian/changelog

@@ -1,3 +1,9 @@
+apt (0.7.26~exp2) experimental; urgency=low
+
+  * fix crash when LANGUAGE is not set
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 22:07:23 +0100
+
 apt (0.7.26~exp1) experimental; urgency=low
 
   [ David Kalnischkies ]