From owner-cvs-all@FreeBSD.ORG Sat Jan 26 06:49:32 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FDE116A41B; Sat, 26 Jan 2008 06:49:32 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1200013C447; Sat, 26 Jan 2008 06:49:32 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0Q6nVQn043348; Sat, 26 Jan 2008 06:49:31 GMT (envelope-from mtm@repoman.freebsd.org) Received: (from mtm@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0Q6nVCA043347; Sat, 26 Jan 2008 06:49:31 GMT (envelope-from mtm) Message-Id: <200801260649.m0Q6nVCA043347@repoman.freebsd.org> From: Mike Makonnen Date: Sat, 26 Jan 2008 06:49:27 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/netinet6 ip6_output.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2008 06:49:32 -0000 mtm 2008-01-26 06:49:27 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet6 ip6_output.c Log: MFC: rev. 1.110 ---------------------------------------------------------------------------- Instead of manually freeing the packet options structure (and not even doing a good job of it) in the copypktopts() function, just call ip6_clearpktopts() directly. Otherwise, the callers of this function would end up freeing the memory twice. Reviewed by: jinmei PR: kern/116360 ---------------------------------------------------------------------------- Revision Changes Path 1.109.2.1 +1 -6 src/sys/netinet6/ip6_output.c