diff --git a/.gitignore b/.gitignore
index c215a1e7..847f11b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,6 +199,7 @@ tools/unit-tests/unit-linux-loader-syssize
 tools/unit-tests/unit-mpusize
 tools/unit-tests/unit-otp-keystore
 tools/unit-tests/unit-tpm-api-names
+tools/unit-tests/unit-elf-bss-guard
 
 
 # Elf preprocessing tools
diff --git a/src/fdt.c b/src/fdt.c
index 7d944d91..13a3d2e8 100644
--- a/src/fdt.c
+++ b/src/fdt.c
@@ -281,9 +281,15 @@ static void fdt_del_last_string_(void *fdt, const char *s)
 
 static int fdt_splice_(void *fdt, void *splicepoint, int oldlen, int newlen)
 {
+    int data_size;
     char *p, *end;
+
+    data_size = fdt_data_size_(fdt);
+    if (data_size < 0)
+        return data_size;
+
     p = splicepoint;
-    end = (char*)fdt + fdt_data_size_(fdt);
+    end = (char*)fdt + data_size;
     if (((p + oldlen) < p) || ((p + oldlen) > end)) {
         return -FDT_ERR_BADOFFSET;
     }