mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-24 10:16:00 +03:00
- Safer temporary filename generation: create the temporary file to make sure the name is not generated twice
This commit is contained in:
parent
f5c1343722
commit
91dee6058e
2 changed files with 23 additions and 11 deletions
|
@ -77,13 +77,20 @@ subDownloadThread::~subDownloadThread(){
|
|||
}
|
||||
|
||||
void subDownloadThread::run(){
|
||||
// XXX: Trick to get a unique filename
|
||||
// Get a unique filename
|
||||
QString filePath;
|
||||
QTemporaryFile *tmpfile = new QTemporaryFile();
|
||||
if (tmpfile->open()) {
|
||||
filePath = tmpfile->fileName();
|
||||
QTemporaryFile tmpfile;
|
||||
tmpfile.setAutoRemove(false);
|
||||
if (tmpfile.open()) {
|
||||
filePath = tmpfile.fileName();
|
||||
qDebug("Temporary filename is: %s", filePath.toLocal8Bit().data());
|
||||
} else {
|
||||
emit downloadFailureST(this, url, tr("I/O Error"));
|
||||
return;
|
||||
}
|
||||
delete tmpfile;
|
||||
tmpfile.close();
|
||||
// Now temporary file is created but closed so that
|
||||
// curl can use it
|
||||
FILE *f = fopen(filePath.toLocal8Bit().data(), "wb");
|
||||
if(!f) {
|
||||
std::cerr << "couldn't open destination file" << "\n";
|
||||
|
|
|
@ -200,14 +200,19 @@ void HttpConnection::respondCommand(QString command)
|
|||
if(command == "upload")
|
||||
{
|
||||
QByteArray torrentfile = parser.torrent();
|
||||
// XXX: Trick to get a unique filename
|
||||
// Get a unique filename
|
||||
QString filePath;
|
||||
QTemporaryFile *tmpfile = new QTemporaryFile();
|
||||
if (tmpfile->open()) {
|
||||
filePath = tmpfile->fileName();
|
||||
QTemporaryFile tmpfile;
|
||||
tmpfile.setAutoRemove(false);
|
||||
if (tmpfile.open()) {
|
||||
filePath = tmpfile.fileName();
|
||||
} else {
|
||||
std::cerr << "I/O Error: Could not create temporary file" << std::endl;
|
||||
return;
|
||||
}
|
||||
delete tmpfile;
|
||||
// write it to HD
|
||||
tmpfile.close();
|
||||
// Now temporary file is created but closed so that it can be used.
|
||||
// write torrent to temporary file
|
||||
QFile torrent(filePath);
|
||||
if(torrent.open(QIODevice::WriteOnly)) {
|
||||
torrent.write(torrentfile);
|
||||
|
|
Loading…
Reference in a new issue