From owner-p4-projects@FreeBSD.ORG  Sun Aug 31 00:17:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6E711106568B; Sun, 31 Aug 2008 00:17:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31F4A106567F
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 00:17:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FE988FC17
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 00:17:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7V0H06h026740
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 00:17:00 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7V0GxN0026738
	for perforce@freebsd.org; Sun, 31 Aug 2008 00:16:59 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Sun, 31 Aug 2008 00:16:59 GMT
Message-Id: <200808310016.m7V0GxN0026738@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 148879 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Aug 2008 00:17:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=148879

Change 148879 by rpaulo@rpaulo_alpha on 2008/08/31 00:16:54

	Err, cast the sum not the first term.
	While there, intialize stack variables.

Affected files ...

.. //depot/projects/efi/boot/i386/efi/reloc.c#3 edit

Differences ...

==== //depot/projects/efi/boot/i386/efi/reloc.c#3 (text+ko) ====

@@ -46,6 +46,8 @@
 	/*
 	 * Find the relocation address, its size and the relocation entry.
 	 */
+	relsz = 0;
+	relent = 0;
 	for (dynp = dynamic; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_REL:
@@ -73,7 +75,7 @@
 			break;
 		case R_386_RELATIVE:
 			/* Address relative to the base address. */
-			newaddr   = (unsigned long) ImageBase + rel->r_offset;
+			newaddr = (unsigned long *)(ImageBase + rel->r_offset);
 			*newaddr += ImageBase;
 			break;
 		default: