diff options
author | Andrew Dunstan | 2024-07-09 21:29:48 +0000 |
---|---|---|
committer | Andrew Dunstan | 2024-07-09 21:29:48 +0000 |
commit | f7bd0a381de12a5c309f3c19d8c966b77e87cff3 (patch) | |
tree | 540ec1477c7507d484fbe3d3f9f7fb8c5b4ef1f8 | |
parent | 896cd266fd34c2dfbf06297b9f2ea89ae8e5a0b1 (diff) |
Prevent CRLF conversion of inputs in json_parser test module
Do this by opening the file in PG_BINARY_R mode. This prevents us from
getting wrong byte count from stat().
Per complaint from Andres Freund
Discussion: https://postgr.es/m/[email protected]
Backpatch to rlease 17 where this code was introduced
-rw-r--r-- | src/test/modules/test_json_parser/test_json_parser_incremental.c | 2 | ||||
-rw-r--r-- | src/test/modules/test_json_parser/test_json_parser_perf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/modules/test_json_parser/test_json_parser_incremental.c b/src/test/modules/test_json_parser/test_json_parser_incremental.c index f4c442ac365..47040e1e421 100644 --- a/src/test/modules/test_json_parser/test_json_parser_incremental.c +++ b/src/test/modules/test_json_parser/test_json_parser_incremental.c @@ -124,7 +124,7 @@ main(int argc, char **argv) makeJsonLexContextIncremental(&lex, PG_UTF8, need_strings); initStringInfo(&json); - if ((json_file = fopen(testfile, "r")) == NULL) + if ((json_file = fopen(testfile, PG_BINARY_R)) == NULL) pg_fatal("error opening input: %m"); if (fstat(fileno(json_file), &statbuf) != 0) diff --git a/src/test/modules/test_json_parser/test_json_parser_perf.c b/src/test/modules/test_json_parser/test_json_parser_perf.c index ea85626cbd8..74cc5f3f548 100644 --- a/src/test/modules/test_json_parser/test_json_parser_perf.c +++ b/src/test/modules/test_json_parser/test_json_parser_perf.c @@ -55,7 +55,7 @@ main(int argc, char **argv) sscanf(argv[1], "%d", &iter); - if ((json_file = fopen(argv[2], "r")) == NULL) + if ((json_file = fopen(argv[2], PG_BINARY_R)) == NULL) pg_fatal("Could not open input file '%s': %m", argv[2]); while ((n_read = fread(buff, 1, 6000, json_file)) > 0) |