Skip to content

Fixing reported heap corruption when releasing native memory #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drivehappy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing reported heap corruption when releasing native memory #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified libzopfli-sharp/NativeBinaries/amd64/zopfli.dll
View file
Open in desktop
Binary file not shown.
Binary file modified libzopfli-sharp/NativeBinaries/amd64/zopfli.exp
View file
Open in desktop
Binary file not shown.
Binary file modified libzopfli-sharp/NativeBinaries/amd64/zopfli.lib
View file
Open in desktop
Binary file not shown.
Binary file modified libzopfli-sharp/NativeBinaries/x86/zopfli.dll
View file
Open in desktop
Binary file not shown.
Binary file modified libzopfli-sharp/NativeBinaries/x86/zopfli.exp
View file
Open in desktop
Binary file not shown.
Binary file modified libzopfli-sharp/NativeBinaries/x86/zopfli.lib
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion libzopfli-sharp/Zopfli.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ public static byte[] compress(byte[] data_in, ZopfliFormat type, ZopfliOptions o
finally
{
// Free unmanaged memory
Marshal.FreeHGlobal(result);
if (Environment.Is64BitProcess)
ZopfliCompressor64.ZopfliFree(result);
else
ZopfliCompressor32.ZopfliFree(result);
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions libzopfli-sharp/ZopfliCompressor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ public class ZopfliCompressor32
/// <param name="data_out_size">This is the size of the memory block pointed to by the dynamic output array size</param>
[DllImport("x86\\zopfli.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern void ZopfliCompress(ref ZopfliOptions options, ZopfliFormat output_type, byte[] data, int data_size, ref IntPtr data_out, ref UIntPtr data_out_size);

/// <summary>
/// Frees memory allocated by the native Zopfli library.
/// </summary>
/// <param name="mem">Pointer to the unmanaged memory to free</param>
[DllImport("x86\\zopfli.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern void ZopfliFree(IntPtr mem);
}

/// <summary>
Expand All @@ -43,5 +50,12 @@ public class ZopfliCompressor64
/// <param name="data_out_size">This is the size of the memory block pointed to by the dynamic output array size</param>
[DllImport("amd64\\zopfli.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern void ZopfliCompress(ref ZopfliOptions options, ZopfliFormat output_type, byte[] data, int data_size, ref IntPtr data_out, ref UIntPtr data_out_size);

/// <summary>
/// Frees memory allocated by the native Zopfli library.
/// </summary>
/// <param name="mem">Pointer to the unmanaged memory to free</param>
[DllImport("amd64\\zopfli.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern void ZopfliFree(IntPtr mem);
}
}