Minor refactoring.

This commit is contained in:
Reijo Tomperi 2009-10-20 00:55:20 +03:00
parent 6fbf873d25
commit 4f7df21851
1 changed files with 2 additions and 3 deletions

View File

@ -843,7 +843,6 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
case 'p': case 'p':
case 'n': case 'n':
handleNextParameter = true; handleNextParameter = true;
if (paramIter != parameters.end()) ++paramIter;
break; break;
case 'd': case 'd':
i_d_x_f_found = true; i_d_x_f_found = true;
@ -851,14 +850,12 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
parameterLength = (*paramIter)->str().length(); parameterLength = (*paramIter)->str().length();
handleNextParameter = true; handleNextParameter = true;
if (paramIter != parameters.end()) ++paramIter;
break; break;
case 's': case 's':
if (paramIter != parameters.end() && *paramIter && (*paramIter)->str()[0] == '"') if (paramIter != parameters.end() && *paramIter && (*paramIter)->str()[0] == '"')
parameterLength = Token::getStrLength(*paramIter); parameterLength = Token::getStrLength(*paramIter);
handleNextParameter = true; handleNextParameter = true;
if (paramIter != parameters.end()) ++paramIter;
break; break;
} }
} }
@ -910,6 +907,8 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
i_d_x_f_found = false; i_d_x_f_found = false;
percentCharFound = false; percentCharFound = false;
handleNextParameter = false; handleNextParameter = false;
if (paramIter != parameters.end())
++paramIter;
} }
} }