Commit 6b822924 authored by Adriaan de Groot's avatar Adriaan de Groot 💬
Browse files

Sanitize saltCharacter()

 - the array of salt chars should be const, it's read-only
 - the array of salt chars should be static, since it is
   initialized to a constant value anyway and can live beyond
   this one function
 - sizeof(char) is 1 by the standard, so remove the weird
   array-size calculation: here saltCharacters has type
   (const) char[63], and its sizeof() is 63
parent 3be70eda
...@@ -175,12 +175,11 @@ void User::setPath(const QDBusObjectPath &path) { ...@@ -175,12 +175,11 @@ void User::setPath(const QDBusObjectPath &path) {
static char static char
saltCharacter() { saltCharacter() {
char saltCharacters[] = "ABCDEFGHIJKLMNOPQRSTUVXYZ" static const char saltCharacters[] = "ABCDEFGHIJKLMNOPQRSTUVXYZ"
"abcdefghijklmnopqrstuvxyz" "abcdefghijklmnopqrstuvxyz"
"./0123456789"; "./0123456789";
const quint32 index = const quint32 index = QRandomGenerator::system()->bounded(0u, sizeof(saltCharacters));
QRandomGenerator::system()->bounded(0u, (sizeof(saltCharacters)/sizeof(*saltCharacters)));
return saltCharacters[index]; return saltCharacters[index];
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment