Merge pull request #18790 from amitkumar50/cov-rbd-6

rbd: null check before pool_name use

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2017-11-21 08:51:03 -05:00 committed by GitHub
commit d490872f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -442,7 +442,7 @@ int get_pool_image_snapshot_names(const po::variables_map &vm,
//Validate pool name while creating/renaming/copying/cloning/importing/etc
if (spec_validation == SPEC_VALIDATION_FULL) {
boost::regex pattern("^[^@/]+?$");
if (!boost::regex_match (*pool_name, pattern)) {
if ((pool_name != nullptr) && !boost::regex_match (*pool_name, pattern)) {
std::cerr << "rbd: invalid pool name '" << *pool_name << "'" << std::endl;
return -EINVAL;
}