svn commit: r316198 - stable/10/usr.sbin/makefs

[Sevan Janiyan]

Author: sevan (doc committer)
Date: Thu Mar 30 02:02:48 2017
New Revision: 316198
URL: https://svnweb.freebsd.org/changeset/base/316198

Log:
  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

Modified:
  stable/10/usr.sbin/makefs/cd9660.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/makefs/cd9660.c
==============================================================================
--- stable/10/usr.sbin/makefs/cd9660.c	Thu Mar 30 02:00:42 2017	(r316197)
+++ stable/10/usr.sbin/makefs/cd9660.c	Thu Mar 30 02:02:48 2017	(r316198)
@@ -1066,7 +1066,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;