From e639beb074dec2d641b13bdb4f2d080b50dd55cb Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 8 Sep 2013 16:29:01 +0200
Subject: Fix undefined behavior for HP calculation at birth

---
 src/birth.cc | 3 +++
 src/xtra1.cc | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/birth.cc b/src/birth.cc
index 51cd092b..8612efdc 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -810,6 +810,9 @@ static void player_wipe(void)
 	/* Hack -- zero the struct */
 	WIPE(p_ptr, player_type);
 
+	/* Level 1 is the first level */
+	p_ptr->lev = 1;
+
 	/* Not dead yet */
 	p_ptr->lives = 0;
 
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 821fe508..e38c719d 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -1872,6 +1872,8 @@ void calc_hitpoints(void)
 	bonus = ((int)(adj_con_mhp[p_ptr->stat_ind[A_CON]]) - 128);
 
 	/* Calculate hitpoints */
+	assert(p_ptr->lev - 1 >= 0);
+	assert(p_ptr->lev - 1 < PY_MAX_LEVEL);
 	mhp = player_hp[p_ptr->lev - 1] + (bonus * p_ptr->lev / 2);
 
 	/* Always have at least one hitpoint per level */
-- 
cgit v1.2.3