svn commit: r309192 - head/usr.sbin/makefs

[Sevan Janiyan]

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;