Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #2589 from AenBleidd/fix_2583_daily_schedules 

[Manager] Fix time verification to allow '24:00' value in Preferences…
This commit is contained in:
David Anderson 2018-07-10 22:57:27 -07:00 committed by GitHub
parent 137b6563b8 8ff7f01a1f
commit 601595b8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clientgui/DlgAdvPreferences.cpp
View File

@ -1006,33 +1006,17 @@ bool CDlgAdvPreferences::IsValidFloatValueBetween(const wxString& value, double
/* checks if the value is a valid time */ /* checks if the value is a valid time */
bool CDlgAdvPreferences::IsValidTimeValue(const wxString& value) { bool CDlgAdvPreferences::IsValidTimeValue(const wxString& value) {
for(unsigned int i=0; i < value.Length();i++) { for (unsigned int i = 0; i < value.Length(); i++) {
if(!IsValidTimeChar(value[i])) { if (!IsValidTimeChar(value[i])) {
return false; return false;
} }
} }
//verify correct format and range of time values
int h = -1, m = -1;
//verify the format itself
int parsed = sscanf(value.c_str(), "%d:%d", &h, &m);
if (parsed != 2) {
return false;
}
//verify hours
if (h < 0 || h > 23) {
return false;
}
//verify minutes
if (m < 0 || m > 59) {
return false;
}
//all chars are valid, now what is with the value as a whole ? //all chars are valid, now what is with the value as a whole ?
if (value == wxT("24:00")) return true;
wxDateTime dt; wxDateTime dt;
const wxChar* stopChar = dt.ParseFormat(value,wxT("%H:%M")); const wxChar* stopChar = dt.ParseFormat(value, wxT("%H:%M"));
if(stopChar==NULL && value != wxT("24:00")) { if (stopChar == NULL) return false; // conversion failed
// conversion failed if (*stopChar != '\0') return false; // conversion failed
return false;
}
return true; return true;
} }