From owner-svn-src-head@freebsd.org  Sat Nov 26 13:26:30 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 98A62C56AF1;
 Sat, 26 Nov 2016 13:26:30 +0000 (UTC)
 (envelope-from sevan@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 68217C3D;
 Sat, 26 Nov 2016 13:26:30 +0000 (UTC)
 (envelope-from sevan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAQDQToT018040;
 Sat, 26 Nov 2016 13:26:29 GMT (envelope-from sevan@FreeBSD.org)
Received: (from sevan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAQDQTbw018039;
 Sat, 26 Nov 2016 13:26:29 GMT (envelope-from sevan@FreeBSD.org)
Message-Id: <201611261326.uAQDQTbw018039@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sevan set sender to
 sevan@FreeBSD.org using -f
From: Sevan Janiyan <sevan@FreeBSD.org>
Date: Sat, 26 Nov 2016 13:26:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309192 - head/usr.sbin/makefs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2016 13:26:30 -0000

Author: sevan (doc committer)
Date: Sat Nov 26 13:26:29 2016
New Revision: 309192
URL: https://svnweb.freebsd.org/changeset/base/309192

Log:
  Fix null dereference when running out of nodes during rename.
  
  PR:		212370
  Submitted by:	Sascha Wildner <swildner AT gmail>
  Reviewed by:	bcr (mentor)
  Approved by:	bapt
  Obtained from:	NetBSD
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D8643

Modified:
  head/usr.sbin/makefs/cd9660.c

Modified: head/usr.sbin/makefs/cd9660.c
==============================================================================
--- head/usr.sbin/makefs/cd9660.c	Sat Nov 26 12:36:11 2016	(r309191)
+++ head/usr.sbin/makefs/cd9660.c	Sat Nov 26 13:26:29 2016	(r309192)
@@ -1070,7 +1070,7 @@ cd9660_rename_filename(cd9660node *iter,
 
 	tmp = malloc(ISO_FILENAME_MAXLENGTH_WITH_PADDING);
 
-	while (i < num) {
+	while (i < num && iter) {
 		powers = 1;
 		count = 0;
 		digits = 1;