From fc9a644002dc501a5c224e5cc1a7dfba3ca2d1d8 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 25 Nov 2019 13:13:05 +0100 Subject: Cleanup: move overflow safe alloc code into libsquashfs There were only a hand full of instances outside libsquashfs that used the alloc code. In most cases, the thing allocated hat its size derived from something already in memory anyway, so it is safe to assume its size fits into a size_t. At the same time, the opencoded Windows path conversion functions are all unified into a single helper function. Signed-off-by: David Oberhollenzer --- include/util/util.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'include/util') diff --git a/include/util/util.h b/include/util/util.h index 7aa4f31..ed1102b 100644 --- a/include/util/util.h +++ b/include/util/util.h @@ -18,19 +18,4 @@ #define container_of(ptr, type, member) \ ((type *)((char *)ptr - offsetof(type, member))) -/* - Helper for allocating data structures with flexible array members. - - 'base_size' is the size of the struct itself, 'item_size' the size of a - single array element and 'nmemb' the number of elements. - - Iternally checks for arithmetic overflows when allocating the combined thing. - */ -SQFS_INTERNAL -void *alloc_flex(size_t base_size, size_t item_size, size_t nmemb); - -/* Basically the same as calloc, but *ALWAYS* does overflow checking */ -SQFS_INTERNAL -void *alloc_array(size_t item_size, size_t nmemb); - #endif /* UTIL_H */ -- cgit v1.2.3