Fix various memory access problems detected by valgrind

kahrl · kahrl · commit 2ed3067bbed9 · 2013-08-07T19:48:31.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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),

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ bool PathStartsWith(std::string path, std::string prefix)`
`595`	`595`	`&& !IsDirDelimiter(path[pathpos+len])`
`596`	`596`	`&& prefixpos+len < prefixsize`
`597`	`597`	`&& !IsDirDelimiter(`
`598`		`- prefix[prefixsize+len]));`
	`598`	`+ prefix[prefixpos+len]));`
`599`	`599`	`pathpos += len;`
`600`	`600`	`prefixpos += len;`
`601`	`601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,`
`174`	`174`	`current_keys_pending.key_down = false;`
`175`	`175`	`current_keys_pending.key_up = false;`
`176`	`176`	`current_keys_pending.key_enter = false;`
	`177`	`+ current_keys_pending.key_escape = false;`
`177`	`178`
`178`	`179`	`}`
`179`	`180`