tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a bit more checking on input for date: searches

Browse Source
This commit is contained in:
Jean-Francois Dockes 2010-09-13 13:57:20 +02:00
parent 8091075093
commit 05f67f2faf
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/smallut.cpp
View File

@ -717,6 +717,10 @@ static bool parsedate(vector<string>::const_iterator& it,
vector<string>::const_iterator end, DateInterval *dip) vector<string>::const_iterator end, DateInterval *dip)
{ {
dip->y1 = dip->m1 = dip->d1 = dip->y2 = dip->m2 = dip->d2 = 0; dip->y1 = dip->m1 = dip->d1 = dip->y2 = dip->m2 = dip->d2 = 0;
if (it->length() > 4 || !it->length() ||
it->find_first_not_of("0123456789") != string::npos) {
return false;
}
if (it == end || sscanf(it++->c_str(), "%d", &dip->y1) != 1) { if (it == end || sscanf(it++->c_str(), "%d", &dip->y1) != 1) {
return false; return false;
} }
@ -726,6 +730,10 @@ static bool parsedate(vector<string>::const_iterator& it,
return false; return false;
} }
if (it->length() > 2 || !it->length() ||
it->find_first_not_of("0123456789") != string::npos) {
return false;
}
if (it == end || sscanf(it++->c_str(), "%d", &dip->m1) != 1) { if (it == end || sscanf(it++->c_str(), "%d", &dip->m1) != 1) {
return false; return false;
} }
@ -735,6 +743,10 @@ static bool parsedate(vector<string>::const_iterator& it,
return false; return false;
} }
if (it->length() > 2 || !it->length() ||
it->find_first_not_of("0123456789") != string::npos) {
return false;
}
if (it == end || sscanf(it++->c_str(), "%d", &dip->d1) != 1) { if (it == end || sscanf(it++->c_str(), "%d", &dip->d1) != 1) {
return -1; return -1;
} }
@ -751,6 +763,9 @@ static bool parseperiod(vector<string>::const_iterator& it,
dip->y1 = dip->m1 = dip->d1 = dip->y2 = dip->m2 = dip->d2 = 0; dip->y1 = dip->m1 = dip->d1 = dip->y2 = dip->m2 = dip->d2 = 0;
while (it != end) { while (it != end) {
int value; int value;
if (it->find_first_not_of("0123456789") != string::npos) {
return false;
}
if (sscanf(it++->c_str(), "%d", &value) != 1) { if (sscanf(it++->c_str(), "%d", &value) != 1) {
return false; return false;
} }