From d3d36d2694ee41d425799ae746a8879d705833f1 Mon Sep 17 00:00:00 2001
From: Deorder <31899960+deorder@users.noreply.github.com>
Date: Wed, 1 May 2019 00:17:42 +0200
Subject: [PATCH] Fixed issue with releasing file buffer result causing access
 violation while extracting

---
 libbsarch-visualstudio-test.cpp | 76 +++++++++++++++++++++++++++------
 wbBSArchive.pas                 |  2 +-
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/libbsarch-visualstudio-test.cpp b/libbsarch-visualstudio-test.cpp
index a1c57d5..b0c5b46 100644
--- a/libbsarch-visualstudio-test.cpp
+++ b/libbsarch-visualstudio-test.cpp
@@ -1,26 +1,78 @@
 #include <iostream>
+#include <windows.h>
 
 #include "libbsarch.h"
 
 #pragma comment(lib, "libbsarch")
 
+static const std::wstring separators(L"\\/");
+
+std::wstring dirname(const std::wstring& path) {
+  size_t slash_pos = path.find_last_of(separators);
+  return path.substr(0, slash_pos);
+}
+
+std::wstring basename(const std::wstring& path) {
+  size_t slash_pos = path.find_last_of(separators);
+  return path.substr(slash_pos + 1);
+}
+
+bool mkdirp(const std::wstring& directory, bool basedir = true) {
+  DWORD attributes = ::GetFileAttributesW(directory.c_str());
+  if(attributes == INVALID_FILE_ATTRIBUTES) {
+    std::size_t slash_pos = directory.find_last_of(separators);
+    if(slash_pos != std::wstring::npos) {
+      mkdirp(directory.substr(0, slash_pos));
+    }
+    return ::CreateDirectoryW(directory.c_str(), nullptr);
+  } else {
+    return true;
+  }
+}
+
 int main() {
+  bsa_result_message_t result = { 0 };
 	bsa_archive_t archive = bsa_create();
 
-	bsa_result_message_t result = bsa_load_from_file(archive, L"test_read.bsa");
-  if(result.code < 0)
-    printf("%ls\n", result.text);
-	bsa_close(archive);
-  
-	bsa_entry_list_t entries = bsa_entry_list_create();
-	bsa_entry_list_add(entries, L"textures\\grass\\test.dds");
+  {
+    result = bsa_load_from_file(archive, L"test_read.bsa");
+    if(result.code < 0)
+      printf("%ls\n", result.text);
 
-	bsa_create_archive(archive, L"test_write.bsa", baSSE, entries);
-	bsa_add_file_from_disk(archive, L"files", L"files\\textures\\grass\\test.dds");
-	bsa_save(archive);
-	bsa_close(archive);
+    bsa_entry_list_t entries = bsa_entry_list_create();
+    bsa_get_resource_list(archive, entries, L"");
 
-	bsa_entry_list_free(entries);
+    for(size_t index = 0; index < bsa_entry_list_count(entries); index++) {
+      wchar_t filename[2048];
+      bsa_entry_list_get(entries, index, 2048, filename);
+
+      printf("file: %ls\n", filename);
+
+      if(mkdirp(dirname(filename))) {
+        result = bsa_extract_file(archive, filename, filename);
+        if(result.code < 0)
+          printf("%ls\n", result.text);
+      } else {
+        printf("could not create: %ls\n", dirname(filename).c_str());
+      }
+    }
+
+    bsa_entry_list_free(entries);
+
+    bsa_close(archive);
+  }
+
+  {
+    bsa_entry_list_t entries = bsa_entry_list_create();
+    bsa_entry_list_add(entries, L"textures\\grass\\test.dds");
+
+    bsa_create_archive(archive, L"test_write.bsa", baSSE, entries);
+    bsa_add_file_from_disk(archive, L"files", L"files\\textures\\grass\\test.dds");
+    bsa_save(archive);
+    bsa_close(archive);
+
+    bsa_entry_list_free(entries);
+  }
 
 	bsa_free(archive);
 }
diff --git a/wbBSArchive.pas b/wbBSArchive.pas
index 15c2395..01bab0b 100644
--- a/wbBSArchive.pas
+++ b/wbBSArchive.pas
@@ -2215,7 +2215,7 @@ end;
 // Addded: For use in non-Borland C/C++
 procedure TwbBSArchive.ReleaseFileDataCompat(fileDataResult: TwbBSResultBuffer);
 begin
-  FreeAndNil(fileDataResult.data);
+  FreeMem(fileDataResult.data);
   fileDataResult.size := 0;
 end;