From 8c4aa5c19b9e046bdd5ee3597a8404914bd877f5 Mon Sep 17 00:00:00 2001
From: Ole Herman Schumacher Elgesem <ole@northern.tech>
Date: Fri, 3 Oct 2025 14:20:25 +0200
Subject: [PATCH] Fixed crash when reading empty yaml files

Ticket: CFE-4595
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
---
 libutils/json-yaml.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libutils/json-yaml.c b/libutils/json-yaml.c
index cca1954a..24dcd01e 100644
--- a/libutils/json-yaml.c
+++ b/libutils/json-yaml.c
@@ -347,6 +347,13 @@ JsonParseError JsonParseYamlString(const char **data, JsonElement **json_out)
 
     JsonElement *holder = JsonArrayCreate(1);
     JsonParseYamlData(&parser, holder, 0);
+    if (JsonLength(holder) == 0)
+    {
+        JsonDestroy(holder);
+        yaml_parser_delete(&parser);
+        return JSON_PARSE_ERROR_NO_DATA;
+    }
+    assert(JsonAt(holder, 0) != NULL);
     *json_out = JsonCopy(JsonAt(holder, 0));
     JsonDestroy(holder);