From owner-svn-src-all@FreeBSD.ORG  Tue Aug 31 18:11:50 2010
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 80CBD10656AA;
	Tue, 31 Aug 2010 18:11:50 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 706DC8FC0C;
	Tue, 31 Aug 2010 18:11:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7VIBoPU037896;
	Tue, 31 Aug 2010 18:11:50 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7VIBoC5037894;
	Tue, 31 Aug 2010 18:11:50 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201008311811.o7VIBoC5037894@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 31 Aug 2010 18:11:50 +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: r212064 - head/sys/boot/pc98/boot2
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: Tue, 31 Aug 2010 18:11:50 -0000

Author: dim
Date: Tue Aug 31 18:11:50 2010
New Revision: 212064
URL: http://svn.freebsd.org/changeset/base/212064

Log:
  Avoid directly manipulating a NULL pointer (which could result in
  undefined behaviour) in sys/boot/pc98/boot2/boot2.c.
  
  Reviewed by:	nyan
  Approved by:	rpaulo (mentor)

Modified:
  head/sys/boot/pc98/boot2/boot2.c

Modified: head/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- head/sys/boot/pc98/boot2/boot2.c	Tue Aug 31 17:43:47 2010	(r212063)
+++ head/sys/boot/pc98/boot2/boot2.c	Tue Aug 31 18:11:50 2010	(r212064)
@@ -187,9 +187,9 @@ xfsread(ino_t inode, void *buf, size_t n
 static inline uint32_t
 memsize(void)
 {
-    u_char *p = (u_char *)PTOV(0);
+    u_char *p = (u_char *)PTOV(0x401);
 
-    return *(p + 0x401) * 128 * 1024 + *(u_int16_t *)(p + 0x594) * 1024 * 1024;
+    return *p * 128 * 1024 + *(u_int16_t *)(p + (0x594 - 0x401)) * 1024 * 1024;
 }
 
 static inline void