fix segfault with empty LongOpt in --no-* branch

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index b8c7f79848de41d4f4779b216b326fe67bd610b3..75d02cad46972cc262906f7379185c5127f446e5 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -106,7 +106,8 @@ bool CommandLine::Parse(int argc,const char **argv)
         Opt++;
         
         for (A = ArgList; A->end() == false &&
         Opt++;
         
         for (A = ArgList; A->end() == false &&

-             stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
+             (A->LongOpt == 0 || stringcasecmp(Opt,OptEnd,A->LongOpt) != 0);
+             ++A);

 
         // Failed again..
         if (A->end() == true && OptEnd - Opt != 1)
 
         // Failed again..
         if (A->end() == true && OptEnd - Opt != 1)

diff --git a/debian/changelog b/debian/changelog
index 33b1732a651acaa3d68312eaa59c704d568eb117..b263002ae73a328b11f4b55f38a6446a91ff20f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * apt-pkg/contrib/cmdline.cc:
     - apply patch from Daniel Hartwig to fix a segfault in case
       the LongOpt is empty (Closes: #676331)
   * apt-pkg/contrib/cmdline.cc:
     - apply patch from Daniel Hartwig to fix a segfault in case
       the LongOpt is empty (Closes: #676331)

+    - fix segfault with empty LongOpt in --no-* branch

 
   [ Justin B Rye ]
   * doc/apt-cdrom.8.xml:
 
   [ Justin B Rye ]
   * doc/apt-cdrom.8.xml:

diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc
index a37fb022023392955a12d428e21c1fac98565498..de8a30bd6434cf82757e063f5d17423eca73033a 100644 (file)
--- a/test/libapt/commandline_test.cc
+++ b/test/libapt/commandline_test.cc
@@ -9,13 +9,24 @@ int main()
       { 'z', "zero", "Test::Zero", 0 },
       {0,0,0,0}
    };
       { 'z', "zero", "Test::Zero", 0 },
       {0,0,0,0}
    };

-

    CommandLine CmdL(Args,_config);
    CommandLine CmdL(Args,_config);

+

    char const * argv[] = { "test", "--zero", "-t" };
    CmdL.Parse(3 , argv);
    char const * argv[] = { "test", "--zero", "-t" };
    CmdL.Parse(3 , argv);

-

    equals(true, _config->FindB("Test::Worked", false));
    equals(true, _config->FindB("Test::Zero", false));
 
    equals(true, _config->FindB("Test::Worked", false));
    equals(true, _config->FindB("Test::Zero", false));
 

+   _config->Clear("Test");
+   equals(false, _config->FindB("Test::Worked", false));
+   equals(false, _config->FindB("Test::Zero", false));
+
+   _config->Set("Test::Zero", true);
+   equals(true, _config->FindB("Test::Zero", false));
+
+   char const * argv2[] = { "test", "--no-zero", "-t" };
+   CmdL.Parse(3 , argv2);
+   equals(true, _config->FindB("Test::Worked", false));
+   equals(false, _config->FindB("Test::Zero", false));
+

    return 0;
 }
    return 0;
 }