Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixes coverity issue CID 1063352, use after free bug

Browse Source
This commit is contained in:
Dennis Luxen 2013-08-20 10:04:58 +02:00
parent 887c95fe2a
commit 189fbb3f7e
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Util/ProgramOptions.h
View File

@ -21,35 +21,34 @@ or see http://www.gnu.org/licenses/agpl.txt.
Custom validators for use with boost::program_options. Custom validators for use with boost::program_options.
*/ */
#include "OSRMException.h"
#include <boost/any.hpp>
#include <boost/filesystem.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace boost { #include <string>
namespace program_options { #include <vector>
// Class for reporting missing files
class missing_file_error : public boost::program_options::invalid_option_value {
public:
missing_file_error(const std::string& path) : invalid_option_value(path), path(path) {};
~missing_file_error() throw() {};
const char* what() const throw() {
std::string err = get_option_name() + " file not found: " + path;
return err.c_str();
};
protected:
std::string path;
};
}
namespace boost {
namespace filesystem { namespace filesystem {
// Validator for boost::filesystem::path, that verifies that the file exists. // Validator for boost::filesystem::path, that verifies that the file
// The validate() function must be defined in the same namespace as the target type, // exists. The validate() function must be defined in the same namespace
// (boost::filesystem::path in this case), otherwise it will not be called // as the target type, (boost::filesystem::path in this case), otherwise
void validate(boost::any& v, const std::vector<std::string>& values, boost::filesystem::path*, int) { // it is not be called
boost::program_options::validators::check_first_occurrence(v); // avoid previous assignments void validate(
const std::string& input_string = boost::program_options::validators::get_single_string(values); // avoid multiple assignments boost::any & v,
const std::vector<std::string> & values,
boost::filesystem::path *,
int
) {
boost::program_options::validators::check_first_occurrence(v);
const std::string & input_string =
boost::program_options::validators::get_single_string(values);
if(boost::filesystem::is_regular_file(input_string)) { if(boost::filesystem::is_regular_file(input_string)) {
v = boost::any(boost::filesystem::path(input_string)); v = boost::any(boost::filesystem::path(input_string));
} else { } else {
throw boost::program_options::missing_file_error(input_string); throw OSRMException(input_string);
} }
} }
} }