From 2ed3067bbed9844b434b53fb9cacb870e6ca97ea Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Wed, 7 Aug 2013 19:48:31 +0200
Subject: [PATCH] Fix various memory access problems detected by valgrind

---
 src/content_sao.cpp     | 3 +++
 src/filesys.cpp         | 2 +-
 src/guiFormSpecMenu.cpp | 1 +
 src/player.cpp          | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 799c279a4..ed660cf10 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -943,8 +943,11 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_properties_sent(true),
 	m_privs(privs),
 	m_is_singleplayer(is_singleplayer),
+	m_animation_speed(0),
+	m_animation_blend(0),
 	m_animation_sent(false),
 	m_bone_position_sent(false),
+	m_attachment_parent_id(0),
 	m_attachment_sent(false),
 	// public
 	m_moved(false),
diff --git a/src/filesys.cpp b/src/filesys.cpp
index 21ff199a8..356d3018d 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -595,7 +595,7 @@ bool PathStartsWith(std::string path, std::string prefix)
 					&& !IsDirDelimiter(path[pathpos+len])
 					&& prefixpos+len < prefixsize
 					&& !IsDirDelimiter(
-						prefix[prefixsize+len]));
+						prefix[prefixpos+len]));
 			pathpos += len;
 			prefixpos += len;
 		}
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 45b0fe2e0..0f09eaf52 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -174,6 +174,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
 	current_keys_pending.key_down = false;
 	current_keys_pending.key_up = false;
 	current_keys_pending.key_enter = false;
+	current_keys_pending.key_escape = false;
 
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index 8028fe6af..193de55a9 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -34,9 +34,13 @@ Player::Player(IGameDef *gamedef):
 	is_climbing(false),
 	swimming_vertical(false),
 	camera_barely_in_ceiling(false),
+	light(0),
 	inventory(gamedef->idef()),
 	hp(PLAYER_MAX_HP),
+	hurt_tilt_timer(0),
+	hurt_tilt_strength(0),
 	peer_id(PEER_ID_INEXISTENT),
+	keyPressed(0),
 // protected
 	m_gamedef(gamedef),
 	m_breath(-1),