Skip to content

Remove invalid XML1.0 characters from Role/City... fields #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lauris71 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Remove invalid XML1.0 characters from Role/City... fields #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34a447d
Remove invalid XML1.0 characters from Role/City... fields
Jan 2, 2026
9d9db15
Use iterator
Jan 2, 2026
d8ee672
Use reserve/append instead of resize
Jan 2, 2026
598b9e7
Use QValidator
metsma Apr 1, 2026
95942a7
Merge branch 'master' into xml
metsma Nov 6, 2026
115ddfd
Merge commit '49d8a9ee74767aae10bb6db63ee0c8d386dfcb00' into xml
metsma Nov 11, 2026
1c1a0fa
Prevent U+009C from truncating displayed signature roles
metsma Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/dialogs/FileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ QString FileDialog::normalized(const QString &data)
{
static const QRegularExpression control(QStringLiteral(
"["
"\\x{009C}" // Qt treats STRING TERMINATOR as a length-variant separator
"\\x{061C}" // ARABIC LETTER MARK
"\\x{200E}" // LEFT-TO-RIGHT MARK
"\\x{200F}" // RIGHT-TO-LEFT MARK
Expand Down
19 changes: 17 additions & 2 deletions client/dialogs/RoleAddressDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,25 @@
#include "Settings.h"
#include "effects/Overlay.h"

#include <QtGui/QValidator>
#include <QtWidgets/QCompleter>
#include <QtWidgets/QListView>

class RoleAddressDialog::Private: public Ui::RoleAddressDialog {};

class SanitizingValidator: public QValidator {
public:
using QValidator::QValidator;
State validate(QString &input, int &pos) const override {
static const QRegularExpression invalid(
QStringLiteral("[\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F\\x{FFFE}\\x{FFFF}]"));
int before = input.size();
input.remove(invalid);
pos = qMax(0, pos - (before - input.size()));
return Acceptable;
}
};

RoleAddressDialog::RoleAddressDialog(QWidget *parent)
: QDialog(parent)
, d(new Private)
Expand All @@ -37,17 +51,18 @@ RoleAddressDialog::RoleAddressDialog(QWidget *parent)
d->buttonLayout->setDirection(QBoxLayout::RightToLeft);
#endif
setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint);
for(QLineEdit *w: findChildren<QLineEdit*>())
w->setAttribute(Qt::WA_MacShowFocusRect, false);

connect( d->cancel, &QPushButton::clicked, this, &RoleAddressDialog::reject );
connect( d->sign, &QPushButton::clicked, this, &RoleAddressDialog::accept );

auto *validator = new SanitizingValidator(this);
auto list = findChildren<QLineEdit*>();
if(!list.isEmpty())
list.first()->setFocus();
for(QLineEdit *line: list)
{
line->setAttribute(Qt::WA_MacShowFocusRect, false);
line->setValidator(validator);
Settings::Option<QStringList> s{line->objectName(), {}};
auto *completer = new QCompleter(s, line);
completer->setMaxVisibleItems(10);
Expand Down