From owner-svn-src-all@FreeBSD.ORG  Fri Jan  3 09:10:04 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EAEC4A33;
 Fri,  3 Jan 2014 09:10:04 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7A721882;
 Fri,  3 Jan 2014 09:10:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s039A427068871;
 Fri, 3 Jan 2014 09:10:04 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s039A4hq068870;
 Fri, 3 Jan 2014 09:10:04 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201401030910.s039A4hq068870@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 3 Jan 2014 09:10:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260223 - head/lib/libcasper
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.17
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: Fri, 03 Jan 2014 09:10:05 -0000

Author: pjd
Date: Fri Jan  3 09:10:04 2014
New Revision: 260223
URL: http://svnweb.freebsd.org/changeset/base/260223

Log:
  MFp4 @1189741:
  
  - Add missing nvlist_destroy().
  - Don't override nvlout.
  
  Submitted by:	Mariusz Zaborski <oshogbo@FreeBSD.org>
  MFC after:	3 days

Modified:
  head/lib/libcasper/libcasper.c

Modified: head/lib/libcasper/libcasper.c
==============================================================================
--- head/lib/libcasper/libcasper.c	Fri Jan  3 09:07:03 2014	(r260222)
+++ head/lib/libcasper/libcasper.c	Fri Jan  3 09:10:04 2014	(r260223)
@@ -348,7 +348,6 @@ service_message(struct service *service,
 			error = 0;
 		}
 	} else {
-		nvlout = nvlist_create(0);
 		error = service->s_command(cmd,
 		    service_connection_get_limits(sconn), nvlin, nvlout);
 	}
@@ -362,8 +361,9 @@ service_message(struct service *service,
 	if (cap_send_nvlist(service_connection_get_chan(sconn), nvlout) == -1) {
 		pjdlog_errno(LOG_ERR, "Unable to send message to client");
 		service_connection_remove(service, sconn);
-		return;
 	}
+
+	nvlist_destroy(nvlout);
 }
 
 static int