diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc index f90e5cf77c..60871d7ce0 100644 --- a/src/image/ImageManagerDriver.cc +++ b/src/image/ImageManagerDriver.cc @@ -582,14 +582,32 @@ static void monitor_action(istringstream& is, const string& result) { string dsinfo64; - string *dsinfo; + string *dsinfo = 0; ostringstream oss; getline (is, dsinfo64); + if (is.fail()) + { + oss << "Error monitoring datastore " << id << ". Bad monitor data: " + << dsinfo64; + + NebulaLog::log("ImM", Log::ERROR, oss); + return; + } + dsinfo = one_util::base64_decode(dsinfo64); + if (dsinfo == 0) + { + oss << "Error monitoring datastore " << id << ". Bad monitor data: " + << dsinfo64; + + NebulaLog::log("ImM", Log::ERROR, oss); + return; + } + if (result != "SUCCESS") { oss << "Error monitoring datastore " << id << ": " << *dsinfo;