From 5742571153f387303d1bd4708e2ffdd4fb70917a Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Thu, 12 Apr 2018 02:47:27 -0600
Subject: [PATCH] Fusee: Fix overflow condition in SD KIP merging

---
 fusee/fusee-secondary/src/stratosphere.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fusee/fusee-secondary/src/stratosphere.c b/fusee/fusee-secondary/src/stratosphere.c
index 18ce3ebac..83743920e 100644
--- a/fusee/fusee-secondary/src/stratosphere.c
+++ b/fusee/fusee-secondary/src/stratosphere.c
@@ -83,7 +83,9 @@ size_t stratosphere_merge_inis(void *dst, ini1_header_t **inis, unsigned int num
                     printk("Error: %s has wrong Title ID!\n", sd_path);
                     generic_panic();
                 }
-                current_dst_kip += kip1_get_size_from_header(sd_kip);
+                uint64_t sd_kip_size = kip1_get_size_from_header(sd_kip);
+                remaining_size -= sd_kip_size;
+                current_dst_kip += sd_kip_size;
             } else {
                 uint64_t current_kip_size = kip1_get_size_from_header(current_kip);
                 if (current_kip_size > remaining_size) {