Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix deref nullptr when adding new field and pw hidden

This commit is contained in:
Martchus 2017-10-21 21:14:50 +02:00
parent e1386c2a79
commit c217b4f5b4
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gui/fielddelegate.cpp
View File

@ -18,22 +18,28 @@ FieldDelegate::FieldDelegate(QObject *parent)
void FieldDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const void FieldDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
{ {
if (auto *lineEdit = qobject_cast<QLineEdit *>(editor)) { // fall back to default implementation if editor is not QLineEdit
const auto *model = index.model(); auto *const lineEdit = qobject_cast<QLineEdit *>(editor);
lineEdit->setText(model->data(index, Qt::EditRole).toString()); if (!lineEdit) {
if (const auto *fieldModel = qobject_cast<const FieldModel *>(model)) {
if (fieldModel->passwordVisibility() == PasswordVisibility::Never) {
lineEdit->setEchoMode(
fieldModel->field(static_cast<size_t>(index.row()))->type() != FieldType::Password ? QLineEdit::Normal : QLineEdit::Password);
} else {
lineEdit->setEchoMode(QLineEdit::Normal);
}
} else {
lineEdit->setEchoMode(QLineEdit::Normal);
}
} else {
QStyledItemDelegate::setEditorData(editor, index); QStyledItemDelegate::setEditorData(editor, index);
return;
} }
// set the text
const QAbstractItemModel *const model = index.model();
lineEdit->setText(model->data(index, Qt::EditRole).toString());
// set the echo mode
if (index.column() > 0) {
const auto *const fieldModel = qobject_cast<const FieldModel *>(model);
if (fieldModel && fieldModel->passwordVisibility() == PasswordVisibility::Never) {
if (const Field *const field = fieldModel->field(static_cast<size_t>(index.row()))) {
lineEdit->setEchoMode(field->type() != FieldType::Password ? QLineEdit::Normal : QLineEdit::Password);
return;
}
}
}
lineEdit->setEchoMode(QLineEdit::Normal);
} }
} // namespace QtGui } // namespace QtGui