diff --git a/ChangeLog b/ChangeLog
index 39ab80e5b..fb9002154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 
+	* fixed crash when providing corrupt resume data
 	* fixed support for boost-1.44
 	* fixed reversed semantics of queue_up() and queue_down()
 	* added missing functions to python bindings (file_priority(), set_dht_settings())
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 3bc41b9f3..b06233e93 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -868,6 +868,7 @@ namespace libtorrent
 					+ m_resume_data.size(), m_resume_entry, ec, &pos) != 0)
 				{
 					std::vector<char>().swap(m_resume_data);
+					lazy_entry().swap(m_resume_entry);
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 					(*m_ses.m_logger) << time_now_string() << " fastresume data for "
 						<< torrent_file().name() << " rejected: " << ec.message()