Possible fix for #4485 #4487

jordan-hoang · 2024-11-06T06:08:20Z

Description

This fixes an issue with getting a crash when passing in a null string to json::parse(). It instead throws an exception.
Also added in a testcase to check for this.

Link to issue.
#4485

Changes are described in the pull request, or an existing issue is referenced.
The test suite compiles and runs without error.
Code coverage is 100%. Test cases can be added by editing the test suite.
The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header files single_include/nlohmann/json.hpp and single_include/nlohmann/json_fwd.hpp. The whole process is described here.

Throw's an exception when i is nullptr, also added a testcase for this scenario though most likely in the wrong test file.cpp

tests/src/unit-concepts.cpp

include/nlohmann/detail/input/input_adapters.hpp

…nclude

coveralls · 2024-11-09T09:52:55Z

coverage: 100.0%. remained the same
when pulling 97c4eac on jordan-hoang:fix-#4485
into 64f68dc on nlohmann:develop.

github-actions · 2024-11-16T16:29:19Z

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @jordan-hoang
Please read and follow the Contribution Guidelines.

nlohmann

Please also consider the case that

nlohmann::json::parse(nullptr);

is called. This is then interpreted as FILE*, so please adjust inline file_input_adapter input_adapter(std::FILE* file) to also throw and exception if nullptr is provided.

nlohmann · 2024-11-17T09:58:17Z

(Also, please update to the latest develop branch to have a green CI)

jordan-hoang · 2024-11-17T21:58:05Z

Gotcha, ahh so that's what it is, I noticed errors going away when I updated / merged from develop.
Thanks for letting me know.

github-actions · 2024-11-18T05:59:53Z

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @jordan-hoang
Please read and follow the Contribution Guidelines.

nlohmann

Please run "make amalgamate" using Astyle 3.1 (https://astyle.sourceforge.net) to fix the CI issues.

include/nlohmann/detail/input/input_adapters.hpp

nlohmann · 2024-11-18T07:19:26Z

Note "make pretty" is not sufficient as it only indents the files in include and tests. You must run "make amalgamate" to create the single header files in single_includes.

tests/src/unit-deserialization.cpp

include/nlohmann/detail/input/input_adapters.hpp

nlohmann

I added some comments to fix some errors in the CI.

Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>

into fix-nlohmann#4485

github-actions · 2024-11-19T06:09:33Z

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @jordan-hoang
Please read and follow the Contribution Guidelines.

into fix-nlohmann#4485

nlohmann

One minor comment.

include/nlohmann/detail/input/input_adapters.hpp

github-actions · 2024-11-19T07:28:29Z

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @jordan-hoang
Please read and follow the Contribution Guidelines.

into fix-nlohmann#4485

jordan-hoang · 2024-11-19T07:52:13Z

Sorry about all these tiny commits, I make the changes on a windows push em and then do the make amalgamate on a linux vm I have. Should really get make setup for windows so I don't have to do that.

nlohmann

Looks good to me.

github-actions · 2024-11-19T08:56:44Z

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @jordan-hoang
Please read and follow the Contribution Guidelines.

nlohmann · 2024-11-19T12:54:10Z

Thanks a lot!!!

* Possible fix for nlohmann#4485 Throw's an exception when i is nullptr, also added a testcase for this scenario though most likely in the wrong test file.cpp * quick cleanup * Fix compile issues * moved tests around, changed exceptions, removed a possibly unneeded include * add back include <memory> for testing something * Ninja doesn't like not having a \n, at end of file, adding it back * update input_adapter file to deal with empty/null file ptr. * ran make pretty * added test for inputadapter * ran make amalgamate * Update tests/src/unit-deserialization.cpp Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> * Update tests/src/unit-deserialization.cpp Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> * Update input adapters.hpp with new includes * fix unabigious use of _, (there was a double declare) * did the amalagamate * rm duplicate includes * make amalgamate again * reorder * amalgamate * moved it above * amalgamate --------- Co-authored-by: Jordan <jordan-hoang@users.noreply.github.com> Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>

Possible fix for nlohmann#4485

17bd783

Throw's an exception when i is nullptr, also added a testcase for this scenario though most likely in the wrong test file.cpp

jordan-hoang requested a review from nlohmann as a code owner November 6, 2024 06:08

github-actions bot added M tests labels Nov 6, 2024

jordan-hoang added 2 commits November 5, 2024 22:13

quick cleanup

62bc8f8

Fix compile issues

8386c26

nlohmann requested changes Nov 8, 2024

View reviewed changes

tests/src/unit-concepts.cpp Outdated Show resolved Hide resolved

tests/src/unit-concepts.cpp Outdated Show resolved Hide resolved

include/nlohmann/detail/input/input_adapters.hpp Outdated Show resolved Hide resolved

jordan-hoang added 2 commits November 8, 2024 20:20

moved tests around, changed exceptions, removed a possibly unneeded i…

ae4d67d

…nclude

add back include <memory> for testing something

530e063

jordan-hoang requested a review from nlohmann November 9, 2024 08:50

Ninja doesn't like not having a \n, at end of file, adding it back

f99b05a

github-actions bot added S and removed M labels Nov 9, 2024

jordan-hoang added 3 commits November 9, 2024 15:35

Merge branch 'nlohmann:develop' into fix-nlohmann#4485

3c58f91

Merge branch 'develop' into fix-nlohmann#4485

d3c98ae

Merge branch 'develop' into fix-nlohmann#4485

2b85d07

nlohmann linked an issue Nov 17, 2024 that may be closed by this pull request

Crash when parsing nullptr #4485

Closed

2 tasks

nlohmann requested changes Nov 17, 2024

View reviewed changes

jordan-hoang added 2 commits November 17, 2024 14:51

Merge branch 'develop' into fix-nlohmann#4485

b6344fe

update input_adapter file to deal with empty/null file ptr.

557c8eb

github-actions bot added M and removed S labels Nov 17, 2024

nlohmann requested changes Nov 18, 2024

View reviewed changes

include/nlohmann/detail/input/input_adapters.hpp Outdated Show resolved Hide resolved

ran make pretty

fe877cc

nlohmann reviewed Nov 18, 2024

View reviewed changes

tests/src/unit-deserialization.cpp Outdated Show resolved Hide resolved

nlohmann reviewed Nov 18, 2024

View reviewed changes

tests/src/unit-deserialization.cpp Outdated Show resolved Hide resolved

nlohmann reviewed Nov 18, 2024

View reviewed changes

include/nlohmann/detail/input/input_adapters.hpp Show resolved Hide resolved

nlohmann requested changes Nov 18, 2024

View reviewed changes

jordan-hoang and others added 5 commits November 18, 2024 14:23

Update tests/src/unit-deserialization.cpp

c81514c

Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>

Update tests/src/unit-deserialization.cpp

8f4f265

Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>

Update input adapters.hpp with new includes

d884284

Merge branch 'fix-nlohmann#4485' of https://github.com/jordan-hoang/json

ee774a3

into fix-nlohmann#4485

fix unabigious use of _, (there was a double declare)

d121495

jordan-hoang and others added 4 commits November 19, 2024 06:33

did the amalagamate

8ca7ea7

rm duplicate includes

1dfb9e7

Merge branch 'fix-nlohmann#4485' of https://github.com/jordan-hoang/json

0bd5c79

into fix-nlohmann#4485

make amalgamate again

fd1f3b8

nlohmann requested changes Nov 19, 2024

View reviewed changes

include/nlohmann/detail/input/input_adapters.hpp Outdated Show resolved Hide resolved

jordan-hoang and others added 5 commits November 18, 2024 23:49

reorder

fc89258

amalgamate

e69cae3

moved it above

7e302f7

Merge branch 'fix-nlohmann#4485' of https://github.com/jordan-hoang/json

7f3c748

into fix-nlohmann#4485

amalgamate

97c4eac

nlohmann approved these changes Nov 19, 2024

View reviewed changes

nlohmann added this to the Release 3.11.4 milestone Nov 19, 2024

nlohmann merged commit 1f218e1 into nlohmann:develop Nov 19, 2024
128 checks passed

jordan-hoang deleted the fix-#4485 branch November 20, 2024 23:26

nlohmann mentioned this pull request Dec 5, 2024

Overwork documentation #4516

Merged

Uh oh!

Possible fix for #4485 #4487

Possible fix for #4485 #4487

Uh oh!

Conversation

jordan-hoang commented Nov 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coveralls commented Nov 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 16, 2024

🔴 Amalgamation check failed! 🔴

Uh oh!

nlohmann left a comment

Choose a reason for hiding this comment

Uh oh!

nlohmann commented Nov 17, 2024

Uh oh!

jordan-hoang commented Nov 17, 2024

Uh oh!

github-actions bot commented Nov 18, 2024

🔴 Amalgamation check failed! 🔴

Uh oh!

nlohmann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nlohmann commented Nov 18, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nlohmann left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 19, 2024

🔴 Amalgamation check failed! 🔴

Uh oh!

nlohmann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Nov 19, 2024

🔴 Amalgamation check failed! 🔴

Uh oh!

jordan-hoang commented Nov 19, 2024

Uh oh!

nlohmann left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 19, 2024

🔴 Amalgamation check failed! 🔴

Uh oh!

Uh oh!

nlohmann commented Nov 19, 2024

Uh oh!

Uh oh!

jordan-hoang commented Nov 6, 2024 •

edited

Loading

coveralls commented Nov 9, 2024 •

edited

Loading