mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2026-05-01 12:16:20 -04:00
350a2faf67
The logic for parsing a logical subsignature isn't clearly identified and has been, perhaps mistakenly or out of convenience, used to when parsing NDB signatures in addition to LDB subsignatures. What this means is that you can technically use a PCRE subsignature in an NDB file and clam won't complain about it. It won't work however, because a PCRE subsignature requires another matching subsignature to trigger it, but it will parse. The same is likely true for byte-compare subsignatures. This commit restructures that logic a bit so subsignature parsing has its own function and is more organized. I also renamed the functions a little bit and added lots of comments. I fixed a few minor warnings relating to format string characters. The change in str.c:cli_ldbtokenize is to prevent a buffer under-read if you were to use the function on the start of a buffer, as is now down in this commit.
85 lines
3.1 KiB
C
85 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2013-2022 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
|
|
* Copyright (C) 2008-2013 Sourcefire, Inc.
|
|
*
|
|
* Authors: aCaB <acab@clamav.net>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
* MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef MPOOL_H
|
|
#define MPOOL_H
|
|
|
|
#if HAVE_CONFIG_H
|
|
#include "clamav-config.h"
|
|
#endif
|
|
|
|
#ifdef USE_MPOOL
|
|
|
|
#include "clamav-types.h"
|
|
|
|
typedef struct MP mpool_t;
|
|
struct cl_engine;
|
|
|
|
mpool_t *mpool_create(void);
|
|
void mpool_destroy(mpool_t *mpool);
|
|
|
|
void *mpool_malloc(mpool_t *mpool, size_t size);
|
|
void mpool_free(mpool_t *mpool, void *ptr);
|
|
void *mpool_calloc(mpool_t *mpool, size_t nmemb, size_t size);
|
|
void *mpool_realloc(mpool_t *mpool, void *ptr, size_t size);
|
|
void *mpool_realloc2(mpool_t *mpool, void *ptr, size_t size);
|
|
char *cli_mpool_hex2str(mpool_t *mpool, const char *src);
|
|
char *cli_mpool_strdup(mpool_t *mpool, const char *s);
|
|
char *cli_mpool_strndup(mpool_t *mpool, const char *s, size_t n);
|
|
char *cli_mpool_virname(mpool_t *mpool, const char *virname, unsigned int official);
|
|
uint16_t *cli_mpool_hex2ui(mpool_t *mpool, const char *hex);
|
|
void mpool_flush(mpool_t *mpool);
|
|
int mpool_getstats(const struct cl_engine *engine, size_t *used, size_t *total);
|
|
|
|
#define MPOOL_MALLOC(a, b) mpool_malloc(a, b)
|
|
#define MPOOL_FREE(a, b) mpool_free(a, b)
|
|
#define MPOOL_CALLOC(a, b, c) mpool_calloc(a, b, c)
|
|
#define MPOOL_REALLOC(a, b, c) mpool_realloc(a, b, c)
|
|
#define MPOOL_REALLOC2(a, b, c) mpool_realloc2(a, b, c)
|
|
#define CLI_MPOOL_HEX2STR(mpool, src) cli_mpool_hex2str(mpool, src)
|
|
#define CLI_MPOOL_STRDUP(mpool, s) cli_mpool_strdup(mpool, s)
|
|
#define CLI_MPOOL_STRNDUP(mpool, s, n) cli_mpool_strndup(mpool, s, n)
|
|
#define CLI_MPOOL_VIRNAME(mpool, a, b) cli_mpool_virname(mpool, a, b)
|
|
#define CLI_MPOOL_HEX2UI(mpool, hex) cli_mpool_hex2ui(mpool, hex)
|
|
#define MPOOL_FLUSH(val) mpool_flush(val)
|
|
#define MPOOL_GETSTATS(mpool, used, total) mpool_getstats(mpool, used, total)
|
|
|
|
#else /* USE_MPOOL */
|
|
|
|
typedef void mpool_t;
|
|
|
|
#define MPOOL_MALLOC(a, b) cli_malloc(b)
|
|
#define MPOOL_FREE(a, b) free(b)
|
|
#define MPOOL_CALLOC(a, b, c) cli_calloc(b, c)
|
|
#define MPOOL_REALLOC(a, b, c) cli_realloc(b, c)
|
|
#define MPOOL_REALLOC2(a, b, c) cli_realloc2(b, c)
|
|
#define CLI_MPOOL_HEX2STR(mpool, src) cli_hex2str(src)
|
|
#define CLI_MPOOL_STRDUP(mpool, s) cli_strdup(s)
|
|
#define CLI_MPOOL_STRNDUP(mpool, s, n) cli_strdup(s, n)
|
|
#define CLI_MPOOL_VIRNAME(mpool, a, b) cli_virname(a, b)
|
|
#define CLI_MPOOL_HEX2UI(mpool, hex) cli_hex2ui(hex)
|
|
#define MPOOL_FLUSH(val)
|
|
#define MPOOL_GETSTATS(mpool, used, total) -1
|
|
|
|
#endif /* USE_MPOOL */
|
|
|
|
#endif
|