From a3739ada111bf4e36ae7576b24176d1db55e1365 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Thu, 8 Apr 2021 12:04:33 +0200
Subject: Fix: libsquashfs: add sqfs_free() function

On systems like Windows, the dynamic library and applications can
easily end up being linked against different runtime libraries, so
applications cannot be expected to be able to free() any malloc'd
pointer that the library returns.

This commit adds an sqfs_free function so the application can pass
pointers back to the library to call the correct free() implementation.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 extras/browse.c    | 20 ++++++++++----------
 extras/mk42sqfs.c  |  2 +-
 extras/mknastyfs.c |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'extras')

diff --git a/extras/browse.c b/extras/browse.c
index 86ce788..8b96c15 100644
--- a/extras/browse.c
+++ b/extras/browse.c
@@ -70,12 +70,12 @@ static void list_directory(const char *dirname)
 		sqfs_dir_reader_get_root_inode(dr, &root);
 
 		ret = sqfs_dir_reader_find_by_path(dr, root, dirname, &inode);
-		free(root);
+		sqfs_free(root);
 		if (ret)
 			goto fail_resolve;
 
 		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
-		free(inode);
+		sqfs_free(inode);
 		if (ret)
 			goto fail_open;
 	} else {
@@ -85,7 +85,7 @@ static void list_directory(const char *dirname)
 			goto fail_resolve;
 
 		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
-		free(inode);
+		sqfs_free(inode);
 		if (ret)
 			goto fail_open;
 	}
@@ -102,7 +102,7 @@ static void list_directory(const char *dirname)
 		}
 
 		len = ent->size + 1;
-		free(ent);
+		sqfs_free(ent);
 	}
 
 	col_count = 79 / (max_len + 1);
@@ -148,7 +148,7 @@ static void list_directory(const char *dirname)
 
 		printf("%.*s", ent->size + 1, ent->name);
 		fputs("\033[0m", stdout);
-		free(ent);
+		sqfs_free(ent);
 
 		++i;
 		if (i == col_count) {
@@ -231,7 +231,7 @@ static void stat_cmd(const char *filename)
 	if (*filename == '/') {
 		sqfs_dir_reader_get_root_inode(dr, &root);
 		ret = sqfs_dir_reader_find_by_path(dr, root, filename, &inode);
-		free(root);
+		sqfs_free(root);
 		if (ret)
 			goto fail_resolve;
 	} else {
@@ -398,12 +398,12 @@ static void stat_cmd(const char *filename)
 			printf("\tSize: %u\n", idx->size + 1);
 			printf("\tEntry: %.*s\n\n", idx->size + 1, idx->name);
 
-			free(idx);
+			sqfs_free(idx);
 		}
 		break;
 	}
 
-	free(inode);
+	sqfs_free(inode);
 	return;
 fail_resolve:
 	printf("Error resolving '%s', error code %d\n", filename, ret);
@@ -429,7 +429,7 @@ static void cat_cmd(const char *filename)
 	if (*filename == '/') {
 		sqfs_dir_reader_get_root_inode(dr, &root);
 		ret = sqfs_dir_reader_find_by_path(dr, root, filename, &inode);
-		free(root);
+		sqfs_free(root);
 	} else {
 		ret = sqfs_dir_reader_find_by_path(dr, working_dir,
 						   filename, &inode);
@@ -459,7 +459,7 @@ static void cat_cmd(const char *filename)
 		offset += diff;
 	}
 
-	free(inode);
+	sqfs_free(inode);
 }
 
 /*****************************************************************************/
diff --git a/extras/mk42sqfs.c b/extras/mk42sqfs.c
index 92323e0..08dffe6 100644
--- a/extras/mk42sqfs.c
+++ b/extras/mk42sqfs.c
@@ -167,7 +167,7 @@ int main(void)
 	sqfs_meta_writer_get_position(inode_m, &block_start, &offset);
 	super.root_inode_ref = (block_start << 16) | offset;
 	sqfs_meta_writer_write_inode(inode_m, inode);
-	free(inode);
+	sqfs_free(inode);
 
 	/* flush the meta data to the file */
 	sqfs_meta_writer_flush(inode_m);
diff --git a/extras/mknastyfs.c b/extras/mknastyfs.c
index daadf37..20074d3 100644
--- a/extras/mknastyfs.c
+++ b/extras/mknastyfs.c
@@ -146,7 +146,7 @@ int main(void)
 	sqfs_meta_writer_get_position(inode_m, &block_start, &offset);
 	super.root_inode_ref = (block_start << 16) | offset;
 	sqfs_meta_writer_write_inode(inode_m, inode);
-	free(inode);
+	sqfs_free(inode);
 
 	/* flush the meta data to the file */
 	sqfs_meta_writer_flush(inode_m);
-- 
cgit v1.2.3