From owner-svn-src-stable@freebsd.org  Tue Mar 21 03:42:30 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31735D15564;
 Tue, 21 Mar 2017 03:42:30 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E46A799C;
 Tue, 21 Mar 2017 03:42:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L3gSJm086307;
 Tue, 21 Mar 2017 03:42:28 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L3gS23086306;
 Tue, 21 Mar 2017 03:42:28 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201703210342.v2L3gS23086306@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Tue, 21 Mar 2017 03:42:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r315659 - stable/11/usr.sbin/lpr/common_source
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Mar 2017 03:42:30 -0000

Author: pfg
Date: Tue Mar 21 03:42:28 2017
New Revision: 315659
URL: https://svnweb.freebsd.org/changeset/base/315659

Log:
  MFC r314877:
  lpr(1): small bounds check with reallocarray(3).
  
  While here plug a memory leak upon error and postpose the multiplication
  until after reallocation has succeded.
  
  Hinted partially by:	OpenBSD
  Reviewed by:		gad

Modified:
  stable/11/usr.sbin/lpr/common_source/common.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/lpr/common_source/common.c
==============================================================================
--- stable/11/usr.sbin/lpr/common_source/common.c	Tue Mar 21 01:24:56 2017	(r315658)
+++ stable/11/usr.sbin/lpr/common_source/common.c	Tue Mar 21 03:42:28 2017	(r315659)
@@ -167,11 +167,13 @@ getq(const struct printer *pp, struct jo
 		 * realloc the maximum size.
 		 */
 		if (++nitems > arraysz) {
-			arraysz *= 2;
-			queue = (struct jobqueue **)realloc((char *)queue,
-			    arraysz * sizeof(struct jobqueue *));
-			if (queue == NULL)
+			queue = (struct jobqueue **)reallocarray((char *)queue,
+			    arraysz, 2 * sizeof(struct jobqueue *));
+			if (queue == NULL) {
+				free(q);
 				goto errdone;
+			}
+			arraysz *= 2;
 		}
 		queue[nitems-1] = q;
 	}