From owner-svn-src-stable-10@FreeBSD.ORG  Wed Apr 29 15:33:09 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 199C62F4;
 Wed, 29 Apr 2015 15:33:09 +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 07BCF1EA1;
 Wed, 29 Apr 2015 15:33:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFX8pk068146;
 Wed, 29 Apr 2015 15:33:08 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFX8k3068145;
 Wed, 29 Apr 2015 15:33:08 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201504291533.t3TFX8k3068145@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 29 Apr 2015 15:33:08 +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: r282224 - stable/10/lib/libthr/thread
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.20
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: Wed, 29 Apr 2015 15:33:09 -0000

Author: pfg
Date: Wed Apr 29 15:33:07 2015
New Revision: 282224
URL: https://svnweb.freebsd.org/changeset/base/282224

Log:
  MFC	r281857:
  _pthread_cleanup_push: fix allocator sizeof operand mismatch
  
  Same fix appears to be in DragonFly's libthread_xu.
  
  Found by:	Clang Static Analyzer

Modified:
  stable/10/lib/libthr/thread/thr_clean.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libthr/thread/thr_clean.c
==============================================================================
--- stable/10/lib/libthr/thread/thr_clean.c	Wed Apr 29 15:28:04 2015	(r282223)
+++ stable/10/lib/libthr/thread/thr_clean.c	Wed Apr 29 15:33:07 2015	(r282224)
@@ -84,7 +84,7 @@ _pthread_cleanup_push(void (*routine) (v
 	curthread->unwind_disabled = 1;
 #endif
 	if ((newbuf = (struct pthread_cleanup *)
-	    malloc(sizeof(struct _pthread_cleanup_info))) != NULL) {
+	    malloc(sizeof(struct pthread_cleanup))) != NULL) {
 		newbuf->routine = routine;
 		newbuf->routine_arg = arg;
 		newbuf->onheap = 1;