From owner-p4-projects@FreeBSD.ORG  Thu May  1 09:13:42 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEA5C37B407; Thu,  1 May 2003 09:13:41 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9037037B404
	for <perforce@freebsd.org>; Thu,  1 May 2003 09:13:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3735C43F85
	for <perforce@freebsd.org>; Thu,  1 May 2003 09:13:41 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h41GDf0U068660
	for <perforce@freebsd.org>; Thu, 1 May 2003 09:13:41 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GDeRO068657
	for perforce@freebsd.org; Thu, 1 May 2003 09:13:40 -0700 (PDT)
Date: Thu, 1 May 2003 09:13:40 -0700 (PDT)
Message-Id: <200305011613.h41GDeRO068657@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2003 16:13:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=30312

Change 30312 by des@des.at.des.thinksec.com on 2003/05/01 09:13:09

	Avoid dereferencing an unitialized dl handle.  Also, add a cast to
	avoid a warning about assigning void * to a function pointer.

Affected files ...

.. //depot/projects/openpam/lib/openpam_dynamic.c#7 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_dynamic.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#7 $
  */
 
 #include <dlfcn.h>
@@ -57,6 +57,7 @@
 	void *dlh;
 	int i;
 
+	dlh = NULL;
 	if ((module = calloc(1, sizeof *module)) == NULL)
 		goto buf_err;
 
@@ -77,7 +78,7 @@
 		goto buf_err;
 	module->dlh = dlh;
 	for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) {
-		module->func[i] = dlsym(dlh, _pam_sm_func_name[i]);
+		module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]);
 		if (module->func[i] == NULL)
 			openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
 			    path, _pam_sm_func_name[i], dlerror());
@@ -85,7 +86,8 @@
 	return (module);
  buf_err:
 	openpam_log(PAM_LOG_ERROR, "%m");
-	dlclose(dlh);
+	if (dlh != NULL)
+		dlclose(dlh);
 	free(module);
 	return (NULL);
 }