From 278c69f6eb7aedeaf692d06197f6a8aa6b37fc70 Mon Sep 17 00:00:00 2001 From: "Victor M. Alvarez" Date: Wed, 29 Sep 2021 10:17:24 +0200 Subject: [PATCH] Export the yr_free function as part of the API. This function is required for freeing the profiling information obtained with yr_scanner_get_profiling_info. --- libyara/include/yara/mem.h | 5 +++-- libyara/include/yara/scanner.h | 3 --- libyara/mem.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libyara/include/yara/mem.h b/libyara/include/yara/mem.h index 76a6e55e..a35447d4 100644 --- a/libyara/include/yara/mem.h +++ b/libyara/include/yara/mem.h @@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define YR_MEM_H #include +#include #ifdef DMALLOC @@ -51,12 +52,12 @@ void* yr_malloc(size_t size); void* yr_realloc(void* ptr, size_t size); -void yr_free(void* ptr); - char* yr_strdup(const char* str); char* yr_strndup(const char* str, size_t n); +YR_API void yr_free(void* ptr); + #endif int yr_heap_alloc(void); diff --git a/libyara/include/yara/scanner.h b/libyara/include/yara/scanner.h index 070a86b3..06785f8e 100644 --- a/libyara/include/yara/scanner.h +++ b/libyara/include/yara/scanner.h @@ -88,9 +88,6 @@ YR_API YR_RULE* yr_scanner_last_error_rule(YR_SCANNER* scanner); YR_API YR_STRING* yr_scanner_last_error_string(YR_SCANNER* scanner); -YR_API YR_RULE_PROFILING_INFO* yr_scanner_get_profiling_info( - YR_SCANNER* scanner); - YR_API void yr_scanner_reset_profiling_info(YR_SCANNER* scanner); YR_API int yr_scanner_print_profiling_info(YR_SCANNER* scanner); diff --git a/libyara/mem.c b/libyara/mem.c index 02db0457..aacbc0cd 100644 --- a/libyara/mem.c +++ b/libyara/mem.c @@ -73,11 +73,6 @@ void* yr_realloc(void* ptr, size_t size) return (void*) HeapReAlloc(hHeap, HEAP_ZERO_MEMORY, ptr, size); } -void yr_free(void* ptr) -{ - HeapFree(hHeap, 0, ptr); -} - char* yr_strdup(const char* str) { size_t len = strlen(str); @@ -106,6 +101,11 @@ char* yr_strndup(const char* str, size_t n) return (char*) dup; } +YR_API void yr_free(void* ptr) +{ + HeapFree(hHeap, 0, ptr); +} + #else #include @@ -137,11 +137,6 @@ void* yr_realloc(void* ptr, size_t size) return realloc(ptr, size); } -void yr_free(void* ptr) -{ - free(ptr); -} - char* yr_strdup(const char* str) { return strdup(str); @@ -152,4 +147,9 @@ char* yr_strndup(const char* str, size_t n) return strndup(str, n); } +YR_API void yr_free(void* ptr) +{ + free(ptr); +} + #endif