set unit name empty string and nullptr handling fixed (#1422)

eclipse-ecal · Mar 6, 2024 · b2324e7 · b2324e7
1 parent 5a9aad3
commit b2324e7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/ecal/core/src/ecal.cpp b/ecal/core/src/ecal.cpp
@@ -211,12 +211,17 @@ namespace eCAL
    *
    * @param unit_name_  Defines the name of the eCAL unit. 
    *
-   * @return  Zero if succeeded.
+   * @return  Zero if succeeded, -1 if failed.
   **/
   int SetUnitName(const char *unit_name_)
   {
-    g_unit_name = unit_name_;
-    return(0);
+    if (unit_name_ == nullptr) return -1;
+
+    const std::string uname = unit_name_;
+    if (uname.empty()) return -1;
+
+    g_unit_name = uname;
+    return 0;
   }
 
   /**