From 0d101d47c9beb6020242fd105993a0f023485588 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 22 Jul 2009 12:51:51 +0000 Subject: [PATCH] 2009-07-22 Tatsuhiro Tsujikawa Check stream status after file is opened. * src/DefaultBtProgressInfoFile.cc --- ChangeLog | 5 +++++ src/DefaultBtProgressInfoFile.cc | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 21b76ddb..ffd7b25f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-22 Tatsuhiro Tsujikawa + + Check stream status after file is opened. + * src/DefaultBtProgressInfoFile.cc + 2009-07-22 Tatsuhiro Tsujikawa Rewritten stream error handling diff --git a/src/DefaultBtProgressInfoFile.cc b/src/DefaultBtProgressInfoFile.cc index fa571443..ce93ad9f 100644 --- a/src/DefaultBtProgressInfoFile.cc +++ b/src/DefaultBtProgressInfoFile.cc @@ -108,6 +108,10 @@ void DefaultBtProgressInfoFile::save() std::string filenameTemp = _filename+"__temp"; { std::ofstream o(filenameTemp.c_str(), std::ios::out|std::ios::binary); + if(!o) { + throw DL_ABORT_EX(StringFormat(EX_SEGMENT_FILE_WRITE, + _filename.c_str(), strerror(errno)).str()); + } bool torrentDownload = isTorrentDownload(); // file version: 16 bits // values: '1' @@ -212,7 +216,10 @@ void DefaultBtProgressInfoFile::load() { _logger->info(MSG_LOADING_SEGMENT_FILE, _filename.c_str()); std::ifstream in(_filename.c_str(), std::ios::in|std::ios::binary); - + if(!in) { \ + throw DL_ABORT_EX(StringFormat(EX_SEGMENT_FILE_READ, \ + _filename.c_str(), strerror(errno)).str()); + } unsigned char versionBuf[2]; in.read((char*)versionBuf, sizeof(versionBuf)); CHECK_STREAM(in, sizeof(versionBuf));