Check rcutils_strdup() outcome immediately. (#768)

Within rcl_node_init() implementation. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · Nov 2, 2020 · 14ef8e0 · 14ef8e0
1 parent 9be4fe9
commit 14ef8e0
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c
@@ -175,6 +175,13 @@ rcl_init(
     context->impl->init_options.impl->rmw_init_options.enclave = rcutils_strdup(
       "/", context->impl->allocator);
   }
+
+  if (!context->impl->init_options.impl->rmw_init_options.enclave) {
+    RCL_SET_ERROR_MSG("failed to set context name");
+    fail_ret = RCL_RET_BAD_ALLOC;
+    goto fail;
+  }
+
   int validation_result;
   size_t invalid_index;
   ret = rcl_validate_enclave_name(
@@ -195,12 +202,6 @@ rcl_init(
     goto fail;
   }
 
-  if (!context->impl->init_options.impl->rmw_init_options.enclave) {
-    RCL_SET_ERROR_MSG("failed to set context name");
-    fail_ret = RCL_RET_BAD_ALLOC;
-    goto fail;
-  }
-
   rmw_security_options_t * security_options =
     &context->impl->init_options.impl->rmw_init_options.security_options;
   ret = rcl_get_security_options_from_environment(