Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Windows: fix number of arguments in function call (#1586)
Some checks failed
clang-format / check-16 (push) Has been cancelled
CMake Build / build-windows (push) Has been cancelled
CMake Build / build-macos (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
CMake Build / build-ubuntu (push) Has been cancelled
clang-format / check (push) Has been cancelled
clang-format / check-1 (push) Has been cancelled
clang-format / check-2 (push) Has been cancelled
clang-format / check-3 (push) Has been cancelled
clang-format / check-4 (push) Has been cancelled
clang-format / check-5 (push) Has been cancelled
clang-format / check-6 (push) Has been cancelled
clang-format / check-7 (push) Has been cancelled
clang-format / check-8 (push) Has been cancelled
clang-format / check-9 (push) Has been cancelled
clang-format / check-10 (push) Has been cancelled
clang-format / check-11 (push) Has been cancelled
clang-format / check-12 (push) Has been cancelled
clang-format / check-13 (push) Has been cancelled
clang-format / check-14 (push) Has been cancelled
clang-format / check-15 (push) Has been cancelled
CodeQL / Analyze-1 (push) Has been cancelled

Browse source 
Fix the number of NULL arguments in `scanmem.c` call to `cl_scandesc_ex()`.
This commit is contained in:
Val S. 2025-10-04 22:33:01 -04:00 • committed by GitHub
parent 518af0a568
commit 23c3cc05f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/scanmem.c
View file

@ -572,13 +572,12 @@ int scanfile(const char *filename, scanmem_data *scan_data, struct mem_info *inf
&info->bytes_scanned, &info->bytes_scanned,
info->engine, info->engine,
info->options, info->options,
NULL, NULL, // void *context,
NULL, NULL, // const char *hash_hint,
NULL, NULL, // char **hash_out,
NULL, NULL, // const char *hash_alg,
NULL, NULL, // const char *file_type_hint,
NULL, NULL); // char **file_type_out);
NULL);
switch (verdict) { switch (verdict) {
case CL_VERDICT_NOTHING_FOUND: { case CL_VERDICT_NOTHING_FOUND: {

13
examples/ex_scan_callbacks.c
View file

@ -1445,13 +1445,12 @@ int main(int argc, char **argv)
&size, &size,
engine, engine,
&options, &options,
script_context, // context, script_context,
hash_hint, // hash_hint, hash_hint,
&hash_out, // hash_out, &hash_out,
hash_alg, // hash_alg, hash_alg,
file_type_hint, // file_type_hint, file_type_hint,
&file_type_out // file_type_out &file_type_out);
);
/* Calculate size of scanned data */ /* Calculate size of scanned data */
printf("\n"); printf("\n");

22
libclamav/scanners.c
View file

@ -6255,12 +6255,12 @@ cl_error_t cl_scandesc(
&scanned_out, &scanned_out,
engine, engine,
scanoptions, scanoptions,
NULL, NULL, // void *context,
NULL, NULL, // const char *hash_hint,
NULL, NULL, // char **hash_out,
NULL, NULL, // const char *hash_alg,
NULL, NULL, // const char *file_type_hint,
NULL); NULL); // char **file_type_out);
if (NULL != scanned) { if (NULL != scanned) {
if ((SIZEOF_LONG == 4) && if ((SIZEOF_LONG == 4) &&
@ -6303,11 +6303,11 @@ cl_error_t cl_scandesc_callback(
engine, engine,
scanoptions, scanoptions,
context, context,
NULL, NULL, // const char *hash_hint,
NULL, NULL, // char **hash_out,
NULL, NULL, // const char *hash_alg,
NULL, NULL, // const char *file_type_hint,
NULL); NULL); // char **file_type_out);
if (NULL != scanned) { if (NULL != scanned) {
if ((SIZEOF_LONG == 4) && if ((SIZEOF_LONG == 4) &&