CipherSettings: fix crash with empty RawKey

sandman7920 · sandman7920 · commit 1e77bc78e43e · 2021-07-07T10:37:38.000+03:00
Fix crash when CipherSettings::getPassword() is called with empty RawKey. Related issue #2743
diff --git a/src/CipherSettings.cpp b/src/CipherSettings.cpp
@@ -16,7 +16,11 @@ std::string CipherSettings::getPassword() const
         return sqlb::escapeString(password);
     } else {
         // Remove the '0x' part at the beginning
-        return "\"x'" + password.substr(2) + "'\"";
+        if (password.length() > 2) {
+            return "\"x'" + password.substr(2) + "'\"";
+        }
+
+        return "''";
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ std::string CipherSettings::getPassword() const`
`16`	`16`	`return sqlb::escapeString(password);`
`17`	`17`	`} else {`
`18`	`18`	`// Remove the '0x' part at the beginning`
`19`		`- return "\"x'" + password.substr(2) + "'\"";`
	`19`	`+ if (password.length() > 2) {`
	`20`	`+ return "\"x'" + password.substr(2) + "'\"";`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ return "''";`
`20`	`24`	`}`
`21`	`25`	`}`
`22`	`26`