Fixes in Nca and U8Span

Thealexbarney · Aug 18, 2020 · 71824f0 · 71824f0
1 parent f2f2111
commit 71824f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/LibHac/Common/U8Span.cs b/src/LibHac/Common/U8Span.cs
@@ -90,7 +90,7 @@ public U8String ToU8String()
         /// </summary>
         /// <returns><see langword="true"/> if the span has no buffer.
         /// Otherwise, <see langword="false"/>.</returns>
-        public bool IsNull() => _buffer.IsEmpty;
+        public unsafe bool IsNull() => (IntPtr)Unsafe.AsPointer(ref MemoryMarshal.GetReference(_buffer)) == IntPtr.Zero;
 
         /// <summary>
         /// Checks if the <see cref="U8Span"/> has no buffer or begins with a null terminator.

diff --git a/src/LibHac/Common/U8SpanMutable.cs b/src/LibHac/Common/U8SpanMutable.cs
@@ -86,7 +86,7 @@ public U8StringMutable ToU8String()
         /// </summary>
         /// <returns><see langword="true"/> if the span has no buffer.
         /// Otherwise, <see langword="false"/>.</returns>
-        public bool IsNull() => _buffer.IsEmpty;
+        public unsafe bool IsNull() => (IntPtr)Unsafe.AsPointer(ref MemoryMarshal.GetReference(_buffer)) == IntPtr.Zero;
 
         /// <summary>
         /// Checks if the <see cref="U8StringMutable"/> has no buffer or begins with a null terminator.

diff --git a/src/LibHac/FsSystem/NcaUtils/Nca.cs b/src/LibHac/FsSystem/NcaUtils/Nca.cs
@@ -557,7 +557,7 @@ private static HierarchicalIntegrityVerificationStorage InitIvfcForRomFs(NcaFsIn
             return new HierarchicalIntegrityVerificationStorage(initInfo, integrityCheckLevel, leaveOpen);
         }
 
-        public IStorage OpenDecryptedHeaderStorage() => OpenHeaderStorage(true);
+        public IStorage OpenDecryptedHeaderStorage() => OpenHeaderStorage(false);
 
         public IStorage OpenHeaderStorage(bool openEncrypted)
         {