From owner-svn-src-all@FreeBSD.ORG  Wed Jan 25 07:45:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9CE8106564A;
	Wed, 25 Jan 2012 07:45:15 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BA5338FC0A;
	Wed, 25 Jan 2012 07:45:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0P7jFEr013096;
	Wed, 25 Jan 2012 07:45:15 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0P7jFYG013094;
	Wed, 25 Jan 2012 07:45:15 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201201250745.q0P7jFYG013094@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 25 Jan 2012 07:45:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230529 - head/usr.sbin/makefs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2012 07:45:16 -0000

Author: hrs
Date: Wed Jan 25 07:45:15 2012
New Revision: 230529
URL: http://svn.freebsd.org/changeset/base/230529

Log:
  Fix a SIGSEGV problem in directory entry renaming.

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

Modified: head/usr.sbin/makefs/cd9660.c
==============================================================================
--- head/usr.sbin/makefs/cd9660.c	Wed Jan 25 07:14:23 2012	(r230528)
+++ head/usr.sbin/makefs/cd9660.c	Wed Jan 25 07:45:15 2012	(r230529)
@@ -1086,6 +1086,8 @@ cd9660_rename_filename(cd9660node *iter,
 		*/
 
 		while (count < maxlength) {
+			if (*naming == ';')
+				break;
 			naming++;
 			count++;
 		}