From 2d63df90a9d64d3961be07ef0a959bc48b42c73b Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 6 Jan 2015 21:10:12 +0000
Subject: [PATCH] Loader: Initialize the default NCCH values in the class
declaration, not in the constructor.
---
src/core/loader/ncch.cpp | 4 ----
src/core/loader/ncch.h | 8 ++++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 0793cc7cd..883a0f753 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -102,10 +102,6 @@ static bool LZSS_Decompress(u8* compressed, u32 compressed_size, u8* decompresse
/// AppLoader_NCCH constructor
AppLoader_NCCH::AppLoader_NCCH(const std::string& filename) {
this->filename = filename;
- is_compressed = false;
- entry_point = 0;
- ncch_offset = 0;
- exefs_offset = 0;
}
/// AppLoader_NCCH destructor
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 184a20d98..578513f77 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -216,11 +216,11 @@ private:
std::string filename;
bool is_loaded = false;
- bool is_compressed;
+ bool is_compressed = false;
- u32 entry_point;
- u32 ncch_offset; // Offset to NCCH header, can be 0 or after NCSD header
- u32 exefs_offset;
+ u32 entry_point = 0;
+ u32 ncch_offset = 0; // Offset to NCCH header, can be 0 or after NCSD header
+ u32 exefs_offset = 0;
NCCH_Header ncch_header;
ExeFs_Header exefs_header;