UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 23:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Storage: make Storage::nameCompliant less restrictive (accepts

Browse Source 
.*\.[a-z]+). But Script::nameCompliant is stricted: [a-z_0-9.]*
This commit is contained in:
Émilie Feral
2018-09-13 11:07:16 +02:00
parent 51341f4abe
commit 08077cb141
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ion/src/shared/storage.cpp
View File

@@ -278,25 +278,22 @@ bool Storage::isNameTaken(const char * name, Record * recordToExclude) {
return false;
}
bool Storage::nameCompliant(const char * name) const {
/* The name format is [a-z0-9_]*(\.)?[a-z0-9_]+ */
bool Storage::nameCompliant(const char * name) {
/* The name format is .*(\.)?[a-z]+ */
bool dot = false;
const char * currentChar = name;
while (*currentChar != 0) {
if (*currentChar == '.') {
if (dot) {
return false;
} else {
dot = true;
}
dot = true;
currentChar++;
}
if ((*currentChar >= 'a' && *currentChar <= 'z') || *currentChar == '_' || (*currentChar >= '0' && *currentChar <= '9') || *currentChar == '.') {
if (!dot || (*currentChar >= 'a' && *currentChar <= 'z')) {
currentChar++;
continue;
}
return false;
}
return name != currentChar;
return name != currentChar && dot;
}
char * Storage::endBuffer() {