[Coverity] Add some handling for return values in UI code

This commit is contained in:
baldurk
2018-05-08 12:32:56 +01:00
parent 1a5b189441
commit 42979bfeb3
3 changed files with 56 additions and 37 deletions
+25 -14
View File
@@ -331,15 +331,18 @@ void CrashDialog::sendReport()
QHttpPart capture;
QFile *file = new QFile(m_CaptureFilename);
file->open(QIODevice::ReadOnly);
file->setParent(multiPart);
if(file->open(QIODevice::ReadOnly))
{
file->setParent(multiPart);
capture.setHeader(QNetworkRequest::ContentTypeHeader, lit("application/x-renderdoc-capture"));
capture.setHeader(QNetworkRequest::ContentDispositionHeader,
lit("form-data; name=\"capture\"; filename=\"capture.rdc\""));
capture.setBodyDevice(file);
capture.setHeader(QNetworkRequest::ContentTypeHeader,
lit("application/x-renderdoc-capture"));
capture.setHeader(QNetworkRequest::ContentDispositionHeader,
lit("form-data; name=\"capture\"; filename=\"capture.rdc\""));
capture.setBodyDevice(file);
multiPart->append(capture);
multiPart->append(capture);
}
}
if(m_Thumbnail)
@@ -363,15 +366,23 @@ void CrashDialog::sendReport()
QHttpPart report;
QFile *file = new QFile(m_ReportPath);
file->open(QIODevice::ReadOnly);
file->setParent(multiPart);
if(file->open(QIODevice::ReadOnly))
{
file->setParent(multiPart);
report.setHeader(QNetworkRequest::ContentTypeHeader, lit("application/zip"));
report.setHeader(QNetworkRequest::ContentDispositionHeader,
lit("form-data; name=\"report\"; filename=\"report.zip\""));
report.setBodyDevice(file);
report.setHeader(QNetworkRequest::ContentTypeHeader, lit("application/zip"));
report.setHeader(QNetworkRequest::ContentDispositionHeader,
lit("form-data; name=\"report\"; filename=\"report.zip\""));
report.setBodyDevice(file);
multiPart->append(report);
multiPart->append(report);
}
else
{
ui->progressText->setText(tr("Error preparing crash report"));
// can't send report without report.zip
return;
}
}
QNetworkRequest request(QUrl(lit(BUGREPORT_URL)));
@@ -402,35 +402,43 @@ void PerformanceCounterSelection::Load()
QFile f(filename);
if(f.open(QIODevice::ReadOnly | QIODevice::Text))
{
LoadFromJSON(doc, f, JSON_ID, JSON_VER);
bool success = LoadFromJSON(doc, f, JSON_ID, JSON_VER);
QSet<GPUCounter> selectedCounters;
QVariantList counters = doc[lit("counters")].toList();
for(const QVariant &counter : counters)
if(success)
{
QVariantList bytes = counter.toList();
Uuid uuid;
QSet<GPUCounter> selectedCounters;
if(bytes.size() != 4)
QVariantList counters = doc[lit("counters")].toList();
for(const QVariant &counter : counters)
{
qWarning() << "Counter ID doesn't count 4 words";
continue;
QVariantList bytes = counter.toList();
Uuid uuid;
if(bytes.size() != 4)
{
qWarning() << "Counter ID doesn't count 4 words";
continue;
}
for(int i = 0; i < 4; ++i)
{
uuid.words[i] = bytes[i].toUInt();
}
if(!m_UuidToCounter.contains(uuid))
continue;
selectedCounters.insert(m_UuidToCounter[uuid]);
}
for(int i = 0; i < 4; ++i)
{
uuid.words[i] = bytes[i].toUInt();
}
if(!m_UuidToCounter.contains(uuid))
continue;
selectedCounters.insert(m_UuidToCounter[uuid]);
SetSelectedCounters(selectedCounters.toList());
}
else
{
RDDialog::critical(this, tr("Error loading config"),
tr("Couldn't interpret settings in %1.").arg(filename));
}
SetSelectedCounters(selectedCounters.toList());
}
else
{
+1 -1
View File
@@ -1980,7 +1980,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
void MainWindow::on_action_Close_Capture_triggered()
{
PromptCloseCapture();
(void)PromptCloseCapture();
}
void MainWindow::on_action_Save_Capture_Inplace_triggered()