From owner-svn-src-stable-10@FreeBSD.ORG  Fri Jan 23 17:49:17 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 782335AD;
 Fri, 23 Jan 2015 17:49:17 +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 6300E874;
 Fri, 23 Jan 2015 17:49:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NHnHGq001039;
 Fri, 23 Jan 2015 17:49:17 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NHnHsP001038;
 Fri, 23 Jan 2015 17:49:17 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201501231749.t0NHnHsP001038@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 23 Jan 2015 17:49:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r277577 - stable/10/usr.sbin/ngctl
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2015 17:49:17 -0000

Author: glebius
Date: Fri Jan 23 17:49:16 2015
New Revision: 277577
URL: https://svnweb.freebsd.org/changeset/base/277577

Log:
  Merge r277258: plug mutex leak in ngctl(8).

Modified:
  stable/10/usr.sbin/ngctl/main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ngctl/main.c
==============================================================================
--- stable/10/usr.sbin/ngctl/main.c	Fri Jan 23 17:41:34 2015	(r277576)
+++ stable/10/usr.sbin/ngctl/main.c	Fri Jan 23 17:49:16 2015	(r277577)
@@ -324,8 +324,10 @@ DoInteractive(void)
 		history(hist, &hev, H_ENTER, buf);
 		pthread_kill(monitor, SIGUSR1);
 		pthread_mutex_lock(&mutex);
-		if (DoParseCommand(buf) == CMDRTN_QUIT)
+		if (DoParseCommand(buf) == CMDRTN_QUIT) {
+			pthread_mutex_unlock(&mutex);
 			break;
+		}
 		pthread_cond_signal(&cond);
 		pthread_mutex_unlock(&mutex);
 	}