Adding Null check node_secure_root

ros2 · Nov 8, 2018 · a884880 · a884880
1 parent 8070968
commit a884880
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
@@ -147,7 +147,11 @@ const char * rcl_get_secure_root(
     allocator->deallocate(node_fqn, allocator->state);
     allocator->deallocate(node_root_path, allocator->state);
   }
-  if (!rcutils_is_directory(node_secure_root)) {
+  // Check node_secure_root is not NULL before checking directory
+  if (NULL == node_secure_root) {
+    allocator->deallocate(node_secure_root, allocator->state);
+    return NULL;
+  } else if (!rcutils_is_directory(node_secure_root)) {
     allocator->deallocate(node_secure_root, allocator->state);
     return NULL;
   }