Merge pull request 'Handle null parser in WeaselJsonParser_reset and _destroy' (#42) from weaselbot/weaseljson:weaselbot/issue-41 into main
CI / build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, clang-arm64, ubuntu-latest-arm64, true) (push) Successful in 55s
CI / build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc-arm64, ubuntu-latest-arm64, false) (push) Successful in 50s
CI / pre-commit (push) Successful in 51s
CI / build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, clang-amd64, ubuntu-latest-amd64, true) (push) Successful in 1m32s
CI / build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc-amd64, ubuntu-latest-amd64, false) (push) Successful in 1m25s
CI / build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, clang-arm64, ubuntu-latest-arm64, true) (push) Successful in 55s
CI / build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc-arm64, ubuntu-latest-arm64, false) (push) Successful in 50s
CI / pre-commit (push) Successful in 51s
CI / build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, clang-amd64, ubuntu-latest-amd64, true) (push) Successful in 1m32s
CI / build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc-amd64, ubuntu-latest-amd64, false) (push) Successful in 1m25s
Reviewed-on: #42
This commit was merged in pull request #42.
This commit is contained in:
@@ -29,11 +29,17 @@ WeaselJsonParser_create(int stackSize, const WeaselJsonCallbacks *callbacks,
|
||||
|
||||
__attribute__((visibility("default"))) void
|
||||
WeaselJsonParser_reset(WeaselJsonParser *parser) {
|
||||
if (parser == nullptr) {
|
||||
return;
|
||||
}
|
||||
((Parser3 *)parser)->reset();
|
||||
}
|
||||
|
||||
__attribute__((visibility("default"))) void
|
||||
WeaselJsonParser_destroy(WeaselJsonParser *parser) {
|
||||
if (parser == nullptr) {
|
||||
return;
|
||||
}
|
||||
((Parser3 *)parser)->~Parser3();
|
||||
free(parser);
|
||||
}
|
||||
|
||||
@@ -246,6 +246,20 @@ TEST_CASE("create rejects too-small stack") {
|
||||
WeaselJsonParser_destroy(parser);
|
||||
}
|
||||
|
||||
TEST_CASE("reset and destroy accept null parser") {
|
||||
// Creation can legitimately fail and return null. The cleanup functions must
|
||||
// tolerate a null pointer the same way free(nullptr) is a no-op.
|
||||
auto c = noopCallbacks();
|
||||
WeaselJsonParser *parser = WeaselJsonParser_create(-1, &c, nullptr, 0);
|
||||
REQUIRE(parser == nullptr);
|
||||
WeaselJsonParser_reset(parser); // must not crash
|
||||
WeaselJsonParser_destroy(parser); // must not crash
|
||||
|
||||
// Calling reset/destroy on literal nullptr directly must also be safe.
|
||||
WeaselJsonParser_reset(nullptr);
|
||||
WeaselJsonParser_destroy(nullptr);
|
||||
}
|
||||
|
||||
TEST_CASE("parse rejects negative length") {
|
||||
auto c = noopCallbacks();
|
||||
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
||||
|
||||
Reference in New Issue
Block a user