cipher: Fix passphrases containing single quotes

MKleusberg · MKleusberg · commit 5a922fff83eb · 2017-09-01T10:12:54.000+02:00
This fixes a regression introduced in d1e3e98 which makes it impossible to open encrypted databases with single quote characters in their passphrase. See issue #1105.
diff --git a/src/CipherDialog.cpp b/src/CipherDialog.cpp
@@ -40,7 +40,7 @@ CipherDialog::KeyFormats CipherDialog::keyFormat() const
 QString CipherDialog::password() const
 {
     if(keyFormat() == KeyFormats::Passphrase)
-        return QString("'%1'").arg(ui->editPassword->text());
+        return QString("'%1'").arg(ui->editPassword->text().replace("'", "''"));
     else
         return QString("\"x'%1'\"").arg(ui->editPassword->text().mid(2));   // Remove the '0x' part at the beginning
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ CipherDialog::KeyFormats CipherDialog::keyFormat() const`
`40`	`40`	`QString CipherDialog::password() const`
`41`	`41`	`{`
`42`	`42`	`if(keyFormat() == KeyFormats::Passphrase)`
`43`		`- return QString("'%1'").arg(ui->editPassword->text());`
	`43`	`+ return QString("'%1'").arg(ui->editPassword->text().replace("'", "''"));`
`44`	`44`	`else`
`45`	`45`	`return QString("\"x'%1'\"").arg(ui->editPassword->text().mid(2)); // Remove the '0x' part at the beginning`
`46`	`46`	`}`