forked from weaselab/weaseljson
Compare commits
9
Commits
08b864d31b
...
ceb16e5405
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ceb16e5405 | ||
|
|
241c29073b | ||
|
|
abeaae7ed7 | ||
|
|
4bd1088018 | ||
|
|
82bdc8a080 | ||
|
|
6508616edc | ||
|
|
e5c970a605 | ||
|
|
96f61665bf | ||
|
|
34fc22a7c2 |
@@ -68,6 +68,15 @@ int main() {
|
|||||||
expectReject(json, "unknown key in strict root");
|
expectReject(json, "unknown key in strict root");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---- invalid stack size is rejected without crashing ----
|
||||||
|
{
|
||||||
|
RootBuilder b(-1);
|
||||||
|
char buf[] = "null";
|
||||||
|
WeaselJsonStatus s = b.feed(buf, sizeof(buf) - 1);
|
||||||
|
CHECK(s == WeaselJson_REJECT);
|
||||||
|
printf("ok invalid stack size rejected, not crashed\n");
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
std::string json = R"({
|
std::string json = R"({
|
||||||
"name": "Ada É",
|
"name": "Ada É",
|
||||||
|
|||||||
@@ -382,6 +382,8 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
("1e-3", "WeaselJson_REJECT", 0),
|
("1e-3", "WeaselJson_REJECT", 0),
|
||||||
("1000e-3", "WeaselJson_OK", 1),
|
("1000e-3", "WeaselJson_OK", 1),
|
||||||
("100.0e-2", "WeaselJson_OK", 1),
|
("100.0e-2", "WeaselJson_OK", 1),
|
||||||
|
("0.0001e4", "WeaselJson_OK", 1),
|
||||||
|
("0.001e3", "WeaselJson_OK", 1),
|
||||||
("123.0", "WeaselJson_OK", 123),
|
("123.0", "WeaselJson_OK", 123),
|
||||||
("9e18", "WeaselJson_OK", 9000000000000000000),
|
("9e18", "WeaselJson_OK", 9000000000000000000),
|
||||||
("10e18", "WeaselJson_REJECT", 0),
|
("10e18", "WeaselJson_REJECT", 0),
|
||||||
@@ -425,6 +427,7 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
('{"age":-9223372036854775809}', "WeaselJson_REJECT", 0),
|
('{"age":-9223372036854775809}', "WeaselJson_REJECT", 0),
|
||||||
('{"age":1e3}', "WeaselJson_OK", 1000),
|
('{"age":1e3}', "WeaselJson_OK", 1000),
|
||||||
('{"age":2.0}', "WeaselJson_OK", 2),
|
('{"age":2.0}', "WeaselJson_OK", 2),
|
||||||
|
('{"age":0.0001e4}', "WeaselJson_OK", 1),
|
||||||
('{"age":0.001}', "WeaselJson_REJECT", 0),
|
('{"age":0.001}', "WeaselJson_REJECT", 0),
|
||||||
(
|
(
|
||||||
'{"age":-9223372036854775808.0}',
|
'{"age":-9223372036854775808.0}',
|
||||||
@@ -468,6 +471,52 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
self._compile_harness(tmpdir, schema, harness)
|
self._compile_harness(tmpdir, schema, harness)
|
||||||
|
|
||||||
|
def test_integer_no_quadratic_leading_zero_loop(self):
|
||||||
|
"""Regression test for issue #34: leading-zero stripping must not be quadratic."""
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
schema_path = os.path.join(tmpdir, "schema.json")
|
||||||
|
with open(schema_path, "w") as fp:
|
||||||
|
json.dump({"type": "integer"}, fp)
|
||||||
|
result = subprocess.run(
|
||||||
|
[sys.executable, SCRIPT, schema_path],
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||||
|
self.assertIn("parseJsonInt64", result.stdout)
|
||||||
|
self.assertNotIn("digits.erase(digits.begin())", result.stdout)
|
||||||
|
|
||||||
|
def test_integer_large_fractional_leading_zeros(self):
|
||||||
|
"""Numbers with many leading fractional zeros must parse correctly."""
|
||||||
|
if not self.compiler:
|
||||||
|
self.skipTest("C++ compiler not available")
|
||||||
|
harness = textwrap.dedent(
|
||||||
|
"""
|
||||||
|
#include "gen.h"
|
||||||
|
#include <cstdio>
|
||||||
|
#include <string>
|
||||||
|
int main() {
|
||||||
|
const int n = 100000;
|
||||||
|
std::string s = std::string("0.") + std::string(n - 1, '0') + "1e" + std::to_string(n);
|
||||||
|
test_schema::RootBuilder b;
|
||||||
|
WeaselJsonStatus st = b.feed(s.data(), static_cast<int>(s.size()));
|
||||||
|
st = b.finish();
|
||||||
|
if (st != WeaselJson_OK) {
|
||||||
|
std::printf("expected OK, got %d\\n", st);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (b.take() != 1) {
|
||||||
|
std::printf("expected value 1\\n");
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
self._compile_harness(tmpdir, {"type": "integer"}, harness)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
@@ -892,6 +892,10 @@ public:
|
|||||||
explicit RootBuilder(int stackSize = 1024) {{
|
explicit RootBuilder(int stackSize = 1024) {{
|
||||||
cb_ = makeCallbacks();
|
cb_ = makeCallbacks();
|
||||||
parser_ = WeaselJsonParser_create(stackSize, &cb_, this, 0);
|
parser_ = WeaselJsonParser_create(stackSize, &cb_, this, 0);
|
||||||
|
if (!parser_) {{
|
||||||
|
error_ = true;
|
||||||
|
return;
|
||||||
|
}}
|
||||||
{self._ctor_body()}
|
{self._ctor_body()}
|
||||||
}}
|
}}
|
||||||
~RootBuilder() {{ if (parser_) WeaselJsonParser_destroy(parser_); }}
|
~RootBuilder() {{ if (parser_) WeaselJsonParser_destroy(parser_); }}
|
||||||
@@ -996,8 +1000,10 @@ private:
|
|||||||
}}
|
}}
|
||||||
int64_t finalExp = exp - fracDigits + trim;
|
int64_t finalExp = exp - fracDigits + trim;
|
||||||
if (finalExp < 0) return false;
|
if (finalExp < 0) return false;
|
||||||
while (!digits.empty() && digits.front() == '0') digits.erase(digits.begin());
|
size_t leadingZeros = 0;
|
||||||
if (digits.empty()) {{ out = 0; return true; }}
|
while (leadingZeros < digits.size() && digits[leadingZeros] == '0') ++leadingZeros;
|
||||||
|
if (leadingZeros == digits.size()) {{ out = 0; return true; }}
|
||||||
|
if (leadingZeros > 0) digits.erase(0, leadingZeros);
|
||||||
|
|
||||||
constexpr uint64_t kMaxNeg = 9223372036854775808ULL;
|
constexpr uint64_t kMaxNeg = 9223372036854775808ULL;
|
||||||
constexpr uint64_t kMaxPos = 9223372036854775807ULL;
|
constexpr uint64_t kMaxPos = 9223372036854775807ULL;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|||||||
@@ -29,11 +29,17 @@ WeaselJsonParser_create(int stackSize, const WeaselJsonCallbacks *callbacks,
|
|||||||
|
|
||||||
__attribute__((visibility("default"))) void
|
__attribute__((visibility("default"))) void
|
||||||
WeaselJsonParser_reset(WeaselJsonParser *parser) {
|
WeaselJsonParser_reset(WeaselJsonParser *parser) {
|
||||||
|
if (parser == nullptr) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
((Parser3 *)parser)->reset();
|
((Parser3 *)parser)->reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((visibility("default"))) void
|
__attribute__((visibility("default"))) void
|
||||||
WeaselJsonParser_destroy(WeaselJsonParser *parser) {
|
WeaselJsonParser_destroy(WeaselJsonParser *parser) {
|
||||||
|
if (parser == nullptr) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
((Parser3 *)parser)->~Parser3();
|
((Parser3 *)parser)->~Parser3();
|
||||||
free(parser);
|
free(parser);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -246,6 +246,20 @@ TEST_CASE("create rejects too-small stack") {
|
|||||||
WeaselJsonParser_destroy(parser);
|
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") {
|
TEST_CASE("parse rejects negative length") {
|
||||||
auto c = noopCallbacks();
|
auto c = noopCallbacks();
|
||||||
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
||||||
|
|||||||
@@ -95,8 +95,20 @@ def test_create_rejects_too_small_stack():
|
|||||||
raise AssertionError(f"expected ValueError for stackSize={stack_size}")
|
raise AssertionError(f"expected ValueError for stackSize={stack_size}")
|
||||||
|
|
||||||
|
|
||||||
|
def test_missing_library_raises_oserror():
|
||||||
|
try:
|
||||||
|
weaseljson.WeaselJsonParser(
|
||||||
|
weaseljson.WeaselJsonCallbacksBase(),
|
||||||
|
build_dir="/nonexistent",
|
||||||
|
)
|
||||||
|
except OSError:
|
||||||
|
return
|
||||||
|
raise AssertionError("expected OSError when the shared library is missing")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
test_object_keys_routed_correctly()
|
test_object_keys_routed_correctly()
|
||||||
test_mixed_values()
|
test_mixed_values()
|
||||||
test_create_rejects_too_small_stack()
|
test_create_rejects_too_small_stack()
|
||||||
|
test_missing_library_raises_oserror()
|
||||||
print("python bindings ok")
|
print("python bindings ok")
|
||||||
|
|||||||
+1
-7
@@ -84,13 +84,7 @@ class WeaselJsonParser:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
if self._lib is None:
|
if self._lib is None:
|
||||||
import sys
|
raise OSError(f"Could not load libweaseljson from {build_dir}")
|
||||||
|
|
||||||
print(
|
|
||||||
"Could not find libweaseljson implementation",
|
|
||||||
file=sys.stderr,
|
|
||||||
)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
self._lib.WeaselJsonParser_create.argtypes = (
|
self._lib.WeaselJsonParser_create.argtypes = (
|
||||||
ctypes.c_int,
|
ctypes.c_int,
|
||||||
|
|||||||
Reference in New Issue
Block a user