From: chaoskagami <chaos.kagami@gmail.com>
Date: Mon, 23 May 2016 06:51:15 +0000 (-0400)
Subject: Ugh, minor hiccup when porting TuxSH's changes. Basically, we would svcbreak every... 
X-Git-Tag: stable-1~55
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=08f0e84029a3cfe232d72b46a2aa0c9f3be154d9;p=corbenik%2Fcorbenik.git

Ugh, minor hiccup when porting TuxSH's changes. Basically, we would svcbreak every time due to a merge error on my part
---

diff --git a/external/loader/source/loader.c b/external/loader/source/loader.c
index bcf5683..c6075e6 100644
--- a/external/loader/source/loader.c
+++ b/external/loader/source/loader.c
@@ -118,7 +118,8 @@ static Result load_code(u64 progid, prog_addrs_t *shared, prog_addrs_t *original
   path.type = PATH_BINARY;
   path.data = CODE_PATH;
   path.size = sizeof(CODE_PATH);
-  if (R_FAILED(IFile_Open(&file, ARCHIVE_SAVEDATA_AND_CONTENT2, archivePath, path, FS_OPEN_READ))) svcBreak(USERBREAK_ASSERT);
+
+  if (R_FAILED(IFile_Open(&file, ARCHIVE_SAVEDATA_AND_CONTENT2, archivePath, path, FS_OPEN_READ)))
   {
     svcBreak(USERBREAK_ASSERT);
   }
diff --git a/external/loader/source/patcher.c b/external/loader/source/patcher.c
index 6655400..ef0cd65 100644
--- a/external/loader/source/patcher.c
+++ b/external/loader/source/patcher.c
@@ -90,13 +90,13 @@ static int fileOpen(IFile *file, FS_ArchiveID id, const char *path, int flags)
     FS_Path apath;
     FS_Path ppath;
 
-    size_t len = strnlen(path, PATH_MAX);
     apath.type = PATH_EMPTY;
     apath.size = 1;
     apath.data = (u8 *)"";
+
     ppath.type = PATH_ASCII;
     ppath.data = path;
-    ppath.size = len + 1;
+    ppath.size = strnlen(path, PATH_MAX) + 1;
 
 	return IFile_Open(file, id, apath, ppath, flags);
 }