From owner-svn-src-all@FreeBSD.ORG  Sun Feb  8 22:24:19 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 21D3FF21;
 Sun,  8 Feb 2015 22:24:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DD49373;
 Sun,  8 Feb 2015 22:24:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18MOIkR042245;
 Sun, 8 Feb 2015 22:24:18 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18MOICZ042244;
 Sun, 8 Feb 2015 22:24:18 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502082224.t18MOICZ042244@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 22:24:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278414 - head/lib/libedit
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 22:24:19 -0000

Author: bapt
Date: Sun Feb  8 22:24:18 2015
New Revision: 278414
URL: https://svnweb.freebsd.org/changeset/base/278414

Log:
  Reapply r255891

Modified:
  head/lib/libedit/readline.c

Modified: head/lib/libedit/readline.c
==============================================================================
--- head/lib/libedit/readline.c	Sun Feb  8 22:24:03 2015	(r278413)
+++ head/lib/libedit/readline.c	Sun Feb  8 22:24:18 2015	(r278414)
@@ -395,6 +395,9 @@ readline(const char *p)
 	char *buf;
 	static int used_event_hook;
 
+	if (line == NULL)
+		return 0;
+
 	if (e == NULL || h == NULL)
 		rl_initialize();