Fixed bug in rcg::getEnum() function that may lead to a seg fault

roboception · Jan 1, 2019 · f6c18d4 · f6c18d4
1 parent d77877b
commit f6c18d4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/rc_genicam_api/config.cc b/rc_genicam_api/config.cc
@@ -658,7 +658,16 @@ std::string getEnum(const std::shared_ptr<GenApi::CNodeMapRef> &nodemap, const c
 
  if (val != 0)
  {
- ret=val->GetCurrentEntry()->GetSymbolic();
+ GenApi::IEnumEntry *entry=val->GetCurrentEntry();
+
+ if (entry != 0)
+ {
+ ret=entry->GetSymbolic();
+ }
+ else if (exception)
+ {
+ throw std::invalid_argument(std::string("Current value is not defined: ")+name);
+ }
  }
  else if (exception)
  {