d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix possible crash when adding a torrent

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
dbceed21f5
commit
1597007ea1
1 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/bittorrent.cpp

42
src/bittorrent.cpp
Unescape View File

@ -712,7 +712,7 @@ bool Bittorrent::hasActiveTorrents() const {
std::vector<torrent_handle> torrents = getTorrents(); std::vector<torrent_handle> torrents = getTorrents();
std::vector<torrent_handle>::iterator torrentIT; std::vector<torrent_handle>::iterator torrentIT;
for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) { for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
const QTorrentHandle &h = QTorrentHandle(*torrentIT); const QTorrentHandle h(*torrentIT);
if(h.is_valid() && !h.is_paused() && !h.is_queued()) if(h.is_valid() && !h.is_paused() && !h.is_queued())
return true; return true;
} }
@ -806,7 +806,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
addConsoleMessage(tr("'%1' is not a valid magnet URI.").arg(magnet_uri)); addConsoleMessage(tr("'%1' is not a valid magnet URI.").arg(magnet_uri));
return h; return h;
} }
const QDir &torrentBackup(misc::BTBackupLocation()); const QDir torrentBackup(misc::BTBackupLocation());
if(resumed) { if(resumed) {
qDebug("Resuming magnet URI: %s", qPrintable(hash)); qDebug("Resuming magnet URI: %s", qPrintable(hash));
// Load metadata // Load metadata
@ -831,7 +831,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
//Getting fast resume data if existing //Getting fast resume data if existing
std::vector<char> buf; std::vector<char> buf;
if(resumed) { if(resumed) {
const QString &fastresume_path = torrentBackup.path()+QDir::separator()+hash+QString(".fastresume"); const QString fastresume_path = torrentBackup.path()+QDir::separator()+hash+QString(".fastresume");
qDebug("Trying to load fastresume data: %s", qPrintable(fastresume_path)); qDebug("Trying to load fastresume data: %s", qPrintable(fastresume_path));
if (load_file(fastresume_path.toLocal8Bit().constData(), buf) == 0) { if (load_file(fastresume_path.toLocal8Bit().constData(), buf) == 0) {
fastResume = true; fastResume = true;
@ -931,7 +931,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool resumed) { QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool resumed) {
QTorrentHandle h; QTorrentHandle h;
bool fastResume=false; bool fastResume=false;
const QDir &torrentBackup(misc::BTBackupLocation()); const QDir torrentBackup(misc::BTBackupLocation());
QString hash; QString hash;
boost::intrusive_ptr<torrent_info> t; boost::intrusive_ptr<torrent_info> t;
@ -944,7 +944,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
} }
} }
// Processing torrents // Processing torrents
const QString &file = path.trimmed().replace("file://", "", Qt::CaseInsensitive); const QString file = path.trimmed().replace("file://", "", Qt::CaseInsensitive);
if(file.isEmpty()) { if(file.isEmpty()) {
return h; return h;
} }
@ -1039,7 +1039,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
//Getting fast resume data if existing //Getting fast resume data if existing
std::vector<char> buf; std::vector<char> buf;
if(resumed) { if(resumed) {
const QString &fastresume_path = torrentBackup.path()+QDir::separator()+hash+QString(".fastresume"); const QString fastresume_path = torrentBackup.path()+QDir::separator()+hash+QString(".fastresume");
qDebug("Trying to load fastresume data: %s", qPrintable(fastresume_path)); qDebug("Trying to load fastresume data: %s", qPrintable(fastresume_path));
if (load_file(fastresume_path.toLocal8Bit().constData(), buf) == 0) { if (load_file(fastresume_path.toLocal8Bit().constData(), buf) == 0) {
fastResume = true; fastResume = true;
@ -1349,7 +1349,7 @@ bool Bittorrent::enableDHT(bool b) {
if(b) { if(b) {
if(!DHTEnabled) { if(!DHTEnabled) {
entry dht_state; entry dht_state;
const QString &dht_state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state"); const QString dht_state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state");
if(QFile::exists(dht_state_path)) { if(QFile::exists(dht_state_path)) {
boost::filesystem::ifstream dht_state_file(dht_state_path.toLocal8Bit().constData(), std::ios_base::binary); boost::filesystem::ifstream dht_state_file(dht_state_path.toLocal8Bit().constData(), std::ios_base::binary);
dht_state_file.unsetf(std::ios_base::skipws); dht_state_file.unsetf(std::ios_base::skipws);
@ -1463,7 +1463,7 @@ void Bittorrent::saveFastResumeData() {
if(!h.is_valid()) continue; if(!h.is_valid()) continue;
// Remove old fastresume file if it exists // Remove old fastresume file if it exists
QFile::remove(torrentBackup.path()+QDir::separator()+ h.hash() + ".fastresume"); QFile::remove(torrentBackup.path()+QDir::separator()+ h.hash() + ".fastresume");
const QString &file = h.hash()+".fastresume"; const QString file = h.hash()+".fastresume";
boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().constData()) / file.toLocal8Bit().constData(), std::ios_base::binary); boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().constData()) / file.toLocal8Bit().constData(), std::ios_base::binary);
out.unsetf(std::ios_base::skipws); out.unsetf(std::ios_base::skipws);
bencode(std::ostream_iterator<char>(out), *rd->resume_data); bencode(std::ostream_iterator<char>(out), *rd->resume_data);
@ -1632,7 +1632,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
if(label.isEmpty()) return; if(label.isEmpty()) return;
// Current save path // Current save path
const QString &old_save_path = TorrentPersistentData::getSavePath(h.hash()); const QString &old_save_path = TorrentPersistentData::getSavePath(h.hash());
const QDir &old_dir(old_save_path); const QDir old_dir(old_save_path);
if(old_dir.dirName() != label) { if(old_dir.dirName() != label) {
const QString &new_save_path = old_dir.absoluteFilePath(label); const QString &new_save_path = old_dir.absoluteFilePath(label);
TorrentPersistentData::saveSavePath(h.hash(), new_save_path); TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
@ -1837,7 +1837,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string()); const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string());
if(torrent_relpath.endsWith(".torrent")) { if(torrent_relpath.endsWith(".torrent")) {
addConsoleMessage(tr("Recursive download of file %1 embedded in torrent %2", "Recursive download of test.torrent embedded in torrent test2").arg(torrent_relpath).arg(h.name())); addConsoleMessage(tr("Recursive download of file %1 embedded in torrent %2", "Recursive download of test.torrent embedded in torrent test2").arg(torrent_relpath).arg(h.name()));
const QString &torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath; const QString torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath;
try { try {
boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData()); boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData());
const QString &sub_hash = misc::toQString(t->info_hash()); const QString &sub_hash = misc::toQString(t->info_hash());
@ -1870,8 +1870,8 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
// Move to download directory if necessary // Move to download directory if necessary
if(!defaultTempPath.isEmpty()) { if(!defaultTempPath.isEmpty()) {
// Check if directory is different // Check if directory is different
const QDir &current_dir(h.save_path()); const QDir current_dir(h.save_path());
const QDir &save_dir(getSavePath(hash)); const QDir save_dir(getSavePath(hash));
if(current_dir != save_dir) { if(current_dir != save_dir) {
h.move_storage(save_dir.path()); h.move_storage(save_dir.path());
} }
@ -1885,7 +1885,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string()); const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string());
if(torrent_relpath.endsWith(".torrent")) { if(torrent_relpath.endsWith(".torrent")) {
qDebug("Found possible recursive torrent download."); qDebug("Found possible recursive torrent download.");
const QString &torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath; const QString torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath;
qDebug("Full subtorrent path is %s", qPrintable(torrent_fullpath)); qDebug("Full subtorrent path is %s", qPrintable(torrent_fullpath));
try { try {
boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData()); boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData());
@ -1914,10 +1914,10 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
} }
} }
else if (save_resume_data_alert* p = dynamic_cast<save_resume_data_alert*>(a.get())) { else if (save_resume_data_alert* p = dynamic_cast<save_resume_data_alert*>(a.get())) {
const QDir &torrentBackup(misc::BTBackupLocation()); const QDir torrentBackup(misc::BTBackupLocation());
const QTorrentHandle h(p->handle); const QTorrentHandle h(p->handle);
if(h.is_valid()) { if(h.is_valid()) {
const QString &file = h.hash()+".fastresume"; const QString file = h.hash()+".fastresume";
// Delete old fastresume file if necessary // Delete old fastresume file if necessary
if(QFile::exists(file)) if(QFile::exists(file))
QFile::remove(file); QFile::remove(file);
@ -1945,7 +1945,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
#endif #endif
emit metadataReceived(h); emit metadataReceived(h);
// Save metadata // Save metadata
const QDir &torrentBackup(misc::BTBackupLocation()); const QDir torrentBackup(misc::BTBackupLocation());
if(!QFile::exists(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent"))) if(!QFile::exists(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent")))
h.save_torrent_file(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent")); h.save_torrent_file(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent"));
// Copy the torrent file to the export folder // Copy the torrent file to the export folder
@ -2104,8 +2104,8 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
// Move to temp directory if necessary // Move to temp directory if necessary
if(!h.is_seed() && !defaultTempPath.isEmpty()) { if(!h.is_seed() && !defaultTempPath.isEmpty()) {
// Check if directory is different // Check if directory is different
const QDir &current_dir(h.save_path()); const QDir current_dir(h.save_path());
const QDir &save_dir(getSavePath(h.hash())); const QDir save_dir(getSavePath(h.hash()));
if(current_dir == save_dir) { if(current_dir == save_dir) {
h.move_storage(defaultTempPath); h.move_storage(defaultTempPath);
} }
@ -2159,7 +2159,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
qDebug("appendLabelToSavePath is true"); qDebug("appendLabelToSavePath is true");
const QString &label = TorrentTempData::getLabel(hash); const QString &label = TorrentTempData::getLabel(hash);
if(!label.isEmpty()) { if(!label.isEmpty()) {
const QDir &save_dir(savePath); const QDir save_dir(savePath);
if(save_dir.dirName() != label) { if(save_dir.dirName() != label) {
savePath = save_dir.absoluteFilePath(label); savePath = save_dir.absoluteFilePath(label);
} }
@ -2267,7 +2267,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
if(DHTEnabled) { if(DHTEnabled) {
try{ try{
entry dht_state = s->dht_state(); entry dht_state = s->dht_state();
const QString &dht_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state"); const QString dht_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state");
boost::filesystem::ofstream out(dht_path.toLocal8Bit().constData(), std::ios_base::binary); boost::filesystem::ofstream out(dht_path.toLocal8Bit().constData(), std::ios_base::binary);
out.unsetf(std::ios_base::skipws); out.unsetf(std::ios_base::skipws);
bencode(std::ostream_iterator<char>(out), dht_state); bencode(std::ostream_iterator<char>(out), dht_state);
@ -2287,7 +2287,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
// backup directory // backup directory
void Bittorrent::startUpTorrents() { void Bittorrent::startUpTorrents() {
qDebug("Resuming unfinished torrents"); qDebug("Resuming unfinished torrents");
const QDir &torrentBackup(misc::BTBackupLocation()); const QDir torrentBackup(misc::BTBackupLocation());
const QStringList &known_torrents = TorrentPersistentData::knownTorrents(); const QStringList &known_torrents = TorrentPersistentData::knownTorrents();
// Safety measure because some people reported torrent loss since // Safety measure because some people reported torrent loss since

Write Preview
Loading…
Cancel
Save