Fix segfault when running `local' command without arguments by Marcin Mirosław (bug #398513).

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 40 insertions, 4 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 508902ff865c..1dc2f111ab01 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.337 2012/01/09 17:11:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.338 2012/01/20 17:21:28 jer Exp $
+
+*lftp-4.3.4-r1 (20 Jan 2012)
+
+  20 Jan 2012; Jeroen Roovers <jer@gentoo.org> -lftp-4.3.4.ebuild,
+  +lftp-4.3.4-r1.ebuild, +files/lftp-4.3.4-empty-local.patch:
+  Fix segfault when running `local' command without arguments by Marcin
+  Mirosław (bug #398513).
 
   09 Jan 2012; Brent Baude <ranger@gentoo.org> lftp-4.3.3.ebuild:
   Marking lftp-4.3.3 ppc for bug 393513
diff --git a/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch b/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch
new file mode 100644
index 000000000000..928d459b3870
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch
@@ -0,0 +1,27 @@
+--- a/src/CmdExec.cc
++++ b/src/CmdExec.cc
+@@ -197,6 +197,8 @@ restart:
+
+    const struct cmd_rec *c;
+    const char *cmd_name=args->getarg(0);
++   if(!cmd_name)
++      return;
+    int part=find_cmd(cmd_name,&c);
+    if(part<=0)
+       eprintf(_("Unknown command `%s'.\n"),cmd_name);
+@@ -1223,10 +1225,14 @@ Job *CmdExec::default_cmd()
+ }
+ Job *CmdExec::builtin_local()
+ {
++   if(args->count()<2) {
++      eprintf(_("Usage: %s cmd [args...]\n"),args->a0());
++      return 0;
++   }
+    saved_session=session.borrow();
+    session=FileAccess::New("file");
+    if(!session) {
+-      eprintf("%s: cannot create local session\n",args->a0());
++      eprintf(_("%s: cannot create local session\n"),args->a0());
+       RevertToSavedSession();
+       return 0;
+    }
diff --git a/net-ftp/lftp/lftp-4.3.4.ebuild b/net-ftp/lftp/lftp-4.3.4-r1.ebuild
index 1e6f52f1d4e5..53912f08dfdd 100644
--- a/net-ftp/lftp/lftp-4.3.4.ebuild
+++ b/net-ftp/lftp/lftp-4.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.4.ebuild,v 1.3 2012/01/02 23:01:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.4-r1.ebuild,v 1.1 2012/01/20 17:21:28 jer Exp $
 
 EAPI="4"
 
@@ -49,8 +49,10 @@ DOCS=(
 )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.2.91-lafile.patch"
-	epatch "${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch"
+	epatch \
+		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
+		"${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch" \
+		"${FILESDIR}/${PN}-4.3.4-empty-local.patch"
 	eautoreconf
 }