aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when QTextCodec::codecForMib returns null.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-11-25 11:34:17 +02:00
parent 9cc97ef602
commit a59f4d7923
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/vmisc/dialogs/dialogexporttocsv.cpp
View File

@ -49,7 +49,10 @@ DialogExportToCSV::DialogExportToCSV(QWidget *parent)
const QList<int> mibs = QTextCodec::availableMibs(); const QList<int> mibs = QTextCodec::availableMibs();
for (auto mib : mibs) for (auto mib : mibs)
{ {
ui->comboBoxCodec->addItem(QTextCodec::codecForMib(mib)->name(), mib); if (QTextCodec *codec = QTextCodec::codecForMib(mib))
{
ui->comboBoxCodec->addItem(codec->name(), mib);
}
} }
ui->comboBoxCodec->setCurrentIndex(ui->comboBoxCodec->findData(VCommonSettings::GetDefCSVCodec())); ui->comboBoxCodec->setCurrentIndex(ui->comboBoxCodec->findData(VCommonSettings::GetDefCSVCodec()));
@ -272,18 +275,18 @@ void DialogExportToCSV::ShowFilePreview(const QString &fileName)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString DialogExportToCSV::MakeHelpCodecsList() QString DialogExportToCSV::MakeHelpCodecsList()
{ {
QString out("\n"); QString out = QStringLiteral("\n");
const QList<int> list = QTextCodec::availableMibs(); const QList<int> list = QTextCodec::availableMibs();
for (int i = 0; i < list.size(); ++i) for (int i = 0; i < list.size(); ++i)
{ {
out += QLatin1String("\t* ") + QTextCodec::codecForMib(list.at(i))->name(); if (QTextCodec *codec = QTextCodec::codecForMib(list.at(i)))
if (i < list.size()-1)
{ {
out += QLatin1String(",\n"); out += QStringLiteral("\t* ") + codec->name();
out += i < list.size()-1 ? QLatin1String(",\n") : QLatin1String(".\n");
} }
else else
{ {
out += QLatin1String(".\n"); qDebug() << "Can't get codec for MIBenum " << i;
} }
} }
return out; return out;
@ -292,7 +295,7 @@ QString DialogExportToCSV::MakeHelpCodecsList()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString DialogExportToCSV::MakeHelpSeparatorList() QString DialogExportToCSV::MakeHelpSeparatorList()
{ {
QString out("\n"); QString out = QStringLiteral("\n");
out += QLatin1String("\t* 'Tab',\n"); out += QLatin1String("\t* 'Tab',\n");
out += QLatin1String("\t* ';',\n"); out += QLatin1String("\t* ';',\n");
out += QLatin1String("\t* 'Space',\n"); out += QLatin1String("\t* 'Space',\n");