This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch abi_16_fuzzers in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 4708631f02cf5a669cc04ba864dbf45fa37aa416 Author: Stephen Webb <[email protected]> AuthorDate: Thu Sep 3 11:20:14 2026 +1000 Update fuzzers to use next ABI method signatures --- src/fuzzers/cpp/HTMLLayoutFuzzer.cpp | 3 +-- src/fuzzers/cpp/JSONLayoutFuzzer.cpp | 3 +-- src/fuzzers/cpp/PatternConverterFuzzer.cpp | 32 +++++++++++------------- src/fuzzers/cpp/TimeBasedRollingPolicyFuzzer.cpp | 3 +-- src/fuzzers/cpp/XMLLayoutFuzzer.cpp | 3 +-- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp b/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp index b35f3829..7c12b972 100644 --- a/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp +++ b/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp @@ -38,7 +38,6 @@ namespace extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // Setup HTMLLayout HTMLLayout layout; - Pool p; FuzzedDataProvider fdp(data, size); @@ -57,7 +56,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { std::string headerStr = fdp.ConsumeRandomLengthString(MaxValueLength); LogString header; Transcoder::decode(headerStr, header); - layout.appendHeader(header, p); + layout.appendHeader(header); } // Create random strings we need later diff --git a/src/fuzzers/cpp/JSONLayoutFuzzer.cpp b/src/fuzzers/cpp/JSONLayoutFuzzer.cpp index e6c1faf3..d60e7493 100644 --- a/src/fuzzers/cpp/JSONLayoutFuzzer.cpp +++ b/src/fuzzers/cpp/JSONLayoutFuzzer.cpp @@ -95,9 +95,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { log4cxx::MDC::put(key4, val4); // Call the target API - log4cxx::helpers::Pool p; log4cxx::LogString result; - layout.format(result, event, p); + layout.format(result, event); // Clean up log4cxx::NDC::clear(); diff --git a/src/fuzzers/cpp/PatternConverterFuzzer.cpp b/src/fuzzers/cpp/PatternConverterFuzzer.cpp index 74950d13..92d57747 100644 --- a/src/fuzzers/cpp/PatternConverterFuzzer.cpp +++ b/src/fuzzers/cpp/PatternConverterFuzzer.cpp @@ -91,8 +91,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // Create the event auto level = Level::getInfo(); - Pool p; - auto event = std::make_shared<LoggingEvent>( logger, level, content, LOG4CXX_LOCATION); // Select a converter and invoke it. @@ -104,62 +102,62 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { Transcoder::decode(nameStr, name); Transcoder::decode(opionStr, option); - PropertiesPatternConverter(name, option).format(event, logger, p); + PropertiesPatternConverter(name, option).format(event, logger); break; } case 1: { - LoggerPatternConverter(createOptions(&fdp)).format(event, logger, p); + LoggerPatternConverter(createOptions(&fdp)).format(event, logger); break; } case 2: { - ClassNamePatternConverter(createOptions(&fdp)).format(event, logger, p); + ClassNamePatternConverter(createOptions(&fdp)).format(event, logger); break; } case 3: { - DatePatternConverter(createOptions(&fdp)).format(event, logger, p); + DatePatternConverter(createOptions(&fdp)).format(event, logger); break; } case 4: { - FullLocationPatternConverter().format(event, logger, p); + FullLocationPatternConverter().format(event, logger); break; } case 5: { - LineLocationPatternConverter().format(event, logger, p); + LineLocationPatternConverter().format(event, logger); break; } case 6: { - MessagePatternConverter().format(event, logger, p); + MessagePatternConverter().format(event, logger); break; } case 7: { - LineSeparatorPatternConverter().format(event, logger, p); + LineSeparatorPatternConverter().format(event, logger); break; } case 8: { - MethodLocationPatternConverter().format(event, logger, p); + MethodLocationPatternConverter().format(event, logger); break; } case 9: { - LevelPatternConverter().format(event, logger, p); + LevelPatternConverter().format(event, logger); } case 10: { - RelativeTimePatternConverter().format(event, logger, p); + RelativeTimePatternConverter().format(event, logger); break; } case 11: { - ThreadPatternConverter().format(event, logger, p); + ThreadPatternConverter().format(event, logger); break; } case 12: { - ThreadUsernamePatternConverter().format(event, logger, p); + ThreadUsernamePatternConverter().format(event, logger); break; } case 13: { - NDCPatternConverter().format(event, logger, p); + NDCPatternConverter().format(event, logger); break; } case 14: { - ThrowableInformationPatternConverter(fdp.ConsumeBool()).format(event, logger, p); + ThrowableInformationPatternConverter(fdp.ConsumeBool()).format(event, logger); break; } } diff --git a/src/fuzzers/cpp/TimeBasedRollingPolicyFuzzer.cpp b/src/fuzzers/cpp/TimeBasedRollingPolicyFuzzer.cpp index 087d5f14..50cb5dc9 100644 --- a/src/fuzzers/cpp/TimeBasedRollingPolicyFuzzer.cpp +++ b/src/fuzzers/cpp/TimeBasedRollingPolicyFuzzer.cpp @@ -61,12 +61,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { logger->addAppender(rfa); // Log and rollover - Pool pool; for (int i = 0; i < 10; i++) { if (i == 4 || i == 9) { - rfa->rollover(pool); + rfa->rollover(); } LOG4CXX_DEBUG(logger, fdp.ConsumeRandomLengthString(MaxMessageLength)); diff --git a/src/fuzzers/cpp/XMLLayoutFuzzer.cpp b/src/fuzzers/cpp/XMLLayoutFuzzer.cpp index e36595a9..4d0f8882 100644 --- a/src/fuzzers/cpp/XMLLayoutFuzzer.cpp +++ b/src/fuzzers/cpp/XMLLayoutFuzzer.cpp @@ -40,7 +40,6 @@ namespace extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // Setup XMLLayout log4cxx::xml::XMLLayout layout; - Pool p; // Create random strings FuzzedDataProvider fdp(data, size); @@ -85,7 +84,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // Call the target API log4cxx::LogString result; - layout.format(result, event, p); + layout.format(result, event); // Clean up log4cxx::NDC::clear();
