From e3a1e870ef30509b6ba33287bb39a8eca6d9cb4b Mon Sep 17 00:00:00 2001
From: sevan <sevan@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 30 Mar 2017 02:02:48 +0000
Subject: [PATCH] MFC r309192

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
Differential Revision:	https://reviews.freebsd.org/D8643


git-svn-id: svn://svn.freebsd.org/base/stable/10@316198 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/makefs/cd9660.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index e05e52ac3..55acd7237 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1066,7 +1066,7 @@ cd9660_rename_filename(cd9660node *iter, int num, int delete_chars)
 
 	tmp = malloc(ISO_FILENAME_MAXLENGTH_WITH_PADDING);
 
-	while (i < num) {
+	while (i < num && iter) {
 		powers = 1;
 		count = 0;
 		digits = 1;
-- 
2.45.0