From 7a2e1a0a7a575c64eaf050c8ec08e5b36e4acfad Mon Sep 17 00:00:00 2001 From: David Oberhollenzer 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 --- bin/rdsquashfs/dump_xattrs.c | 6 +++--- bin/rdsquashfs/restore_fstree.c | 6 +++--- bin/rdsquashfs/stat.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'bin/rdsquashfs') diff --git a/bin/rdsquashfs/dump_xattrs.c b/bin/rdsquashfs/dump_xattrs.c index 93b0b01..9dbe437 100644 --- a/bin/rdsquashfs/dump_xattrs.c +++ b/bin/rdsquashfs/dump_xattrs.c @@ -95,7 +95,7 @@ int dump_xattrs(sqfs_xattr_reader_t *xattr, const sqfs_inode_generic_t *inode) if (sqfs_xattr_reader_read_value(xattr, key, &value)) { fputs("Error reading xattr value\n", stderr); - free(key); + sqfs_free(key); return -1; } @@ -112,8 +112,8 @@ int dump_xattrs(sqfs_xattr_reader_t *xattr, const sqfs_inode_generic_t *inode) printf("\n"); } - free(key); - free(value); + sqfs_free(key); + sqfs_free(value); } return 0; diff --git a/bin/rdsquashfs/restore_fstree.c b/bin/rdsquashfs/restore_fstree.c index 3d536b6..57582c2 100644 --- a/bin/rdsquashfs/restore_fstree.c +++ b/bin/rdsquashfs/restore_fstree.c @@ -188,7 +188,7 @@ static int set_xattr(const char *path, sqfs_xattr_reader_t *xattr, if (sqfs_xattr_reader_read_value(xattr, key, &value)) { fputs("Error reading xattr value\n", stderr); - free(key); + sqfs_free(key); return -1; } @@ -199,8 +199,8 @@ static int set_xattr(const char *path, sqfs_xattr_reader_t *xattr, key->key, path, strerror(errno)); } - free(key); - free(value); + sqfs_free(key); + sqfs_free(value); if (ret) return -1; } diff --git a/bin/rdsquashfs/stat.c b/bin/rdsquashfs/stat.c index 049baae..a5aab60 100644 --- a/bin/rdsquashfs/stat.c +++ b/bin/rdsquashfs/stat.c @@ -172,7 +172,7 @@ int stat_file(const sqfs_tree_node_t *node) idx->size + 1, idx->name, idx->start_block, idx->index); - free(idx); + sqfs_free(idx); } break; } -- cgit v1.2.3