fix crash when LANGUAGE is not set

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index b5f29472d556460ad55464f882d21f72ac0d4dcc..10613f11dde7d356e43e41c924ccca7c0adc1bca 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/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
                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
        if (envLang.empty() == false) {
                std::vector<string> env = ExplodeString(envLang,':');
                short addedLangs = 0; // add a maximum of 3 fallbacks from the environment

diff --git a/debian/changelog b/debian/changelog
index 558fd8b104abc6f42b77b3e346b0a12af5602c09..ca731d11bbac1b2ce401cede357796cd47fdfc7c 100644 (file)
--- a/debian/changelog
+++ b/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 ]
 apt (0.7.26~exp1) experimental; urgency=low
 
   [ David Kalnischkies ]