summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #608 from besser82/topic/besser82/json-c-0.14/CVE-2020-12762json-c-0.14Eric Hawicz2020-05-155-3/+57
|\ | | | | json-c-0.14: Fix CVE-2020-12762 - json-c through 0.14 has an integer overflow and out-of-bounds write ...
| * Fix CVE-2020-12762.Björn Esser2020-05-155-3/+57
|/ | | | | | | | | | | | This commit is a squashed backport of the following commits on the master branch: * 099016b7e8d70a6d5dd814e788bba08d33d48426 * 77d935b7ae7871a1940cd827e850e6063044ec45 * d07b91014986900a3a75f306d302e13e005e9d67 * 519dfe1591d85432986f9762d41d1a883198c157 * a59d5acfab4485d5133114df61785b1fc633e0c6 * 26f080997d41cfdb17beab65e90c82217d0ac43b
* Issue #585: don't install config.hEric Haszlakiewicz2020-04-211-1/+1
| | | | (cherry picked from commit 8b511c402b73d1d8b195991891c8d44859cb57ec)
* Generate docs for the 0.14 release.json-c-0.14-20200419Eric Haszlakiewicz2020-04-1996-0/+15507
|
* Bump version to 0.14 and shared library version to 5.0.0Eric Haszlakiewicz2020-04-194-10/+10
|
* Fill in the ChangeLog for the upcoming 0.14 release.Eric Haszlakiewicz2020-04-191-3/+68
|
* Fill in a few more pre-release steps to match what we've done for the 0.14 ↵Eric Haszlakiewicz2020-04-193-50/+57
| | | | | | release. Move the list of contributors to the AUTHORS file.
* Rewrite the issued_closed_for_* files so they display a bit nicer.Eric Haszlakiewicz2020-04-182-450/+450
|
* Explicitly mark several things in json_tokener deprecated.Eric Haszlakiewicz2020-04-181-1/+13
|
* Re-do clang-format.Eric Haszlakiewicz2020-04-183-3/+0
|
* Make json_abort() internal to json_object.cEric Haszlakiewicz2020-04-183-23/+25
|
* Make json_tokener_validate_utf8() internal to json_tokener.c, and improve ↵Eric Haszlakiewicz2020-04-182-9/+12
| | | | the docs a bit.
* Merge pull request #582 from dota17/list_closed_issue_prEric Haszlakiewicz2020-04-171-0/+206
|\ | | | | add the list of issues& prs closed
| * updatedota172020-04-171-6/+23
| |
| * manual adjustmentdota172020-04-161-175/+171
| |
| * add the list of issues& prs closeddota172020-04-161-0/+193
|/
* Merge pull request #524 from dota17/addTestCase_obj_tokenEric Haszlakiewicz2020-04-156-3/+90
|\ | | | | Increase coverage
| * remove unsuitable casedota172020-04-151-17/+0
| |
| * clang-format two test_util_file.c and test_object_iterator.cdota172020-04-142-16/+17
| |
| * Increased the test coverage of json_util.c from 76% to 90.3%.chenguoping2020-04-142-0/+47
| |
| * Increased the test coverage of json_object_iterator.c from 0% to 100%chenguoping2020-04-144-1/+57
| |
* | Merge pull request #581 from Jehan/wip/Jehan/no-strict-prototypes-windowsEric Haszlakiewicz2020-04-151-1/+3
|\ \ | | | | | | CMakeLists: do not enforce strict prototypes on Windows.
| * | CMakeLists: do not enforce strict prototypes on Windows.Jehan2020-04-151-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, or at least when cross-built with Mingw-w64, build fails because strict prototype fails on an included file (thus nothing we can do about in json-c code): > from /home/jehan/dev/src/json-c/json_util.c:44: > /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:196:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] > 196 | typedef INT_PTR (WINAPI *FARPROC) (); > | ^~~~~~~ > /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:197:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] > 197 | typedef INT_PTR (WINAPI *NEARPROC) (); > | ^~~~~~~ > /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:198:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] > 198 | typedef INT_PTR (WINAPI *PROC) (); > | ^~~~~~~ Let's just disable the errors for Windows build.
* | Merge pull request #580 from besser82/topic/besser82/fix_cmake_testsEric Haszlakiewicz2020-04-141-2/+2
|\ \ | | | | | | Fix CMake tests for enforced strict prototypes.
| * | Fix CMake tests for enforced strict prototypes.Björn Esser2020-04-141-2/+2
|/ /
* | Merge pull request #527 from dota17/arraylist_testEric Haszlakiewicz2020-04-147-0/+138
|\ \ | | | | | | Arraylist testcase
| * | clang-format test1.cdota172020-04-141-11/+12
| | |
| * | fix valgrind errorschenguoping2020-04-141-2/+9
| | |
| * | testcase for array_listchenguoping2020-04-147-0/+130
| |/
* | Merge pull request #579 from besser82/topic/besser82/strict-prototypesEric Haszlakiewicz2020-04-143-2/+3
|\ \ | |/ |/| Enforce strict prototypes.
| * Enforce strict prototypes.Björn Esser2020-04-133-2/+3
|/
* Merge pull request #578 from besser82/topic/besser82/pkgconfig_installEric Haszlakiewicz2020-04-121-1/+1
|\ | | | | CMake: Install pkgconfig file in proper location by default
| * CMake: Install pkgconfig file in proper location by defaultBjörn Esser2020-04-121-1/+1
|/ | | | | | | The default location for pkconfig files on most systems is: ${CMAKE_INSTALL_LIBDIR}/pkgconfig Thus the file should get installed in there by default.
* Merge pull request #577 from ↵Eric Haszlakiewicz2020-04-111-0/+8
|\ | | | | | | | | besser82/topic/besser82/json_c_version_test_verbose_on_fail Be verbose on failing json_c_version test.
| * Be verbose on failing json_c_version test.Björn Esser2020-04-111-0/+8
|/
* Merge pull request #576 from besser82/topic/besser82/increase_coverageEric Haszlakiewicz2020-04-111-0/+6
|\ | | | | Test coverage for json_c_version.
| * Test coverage for json_c_version.Björn Esser2020-04-111-0/+6
| |
* | Merge pull request #575 from besser82/topic/besser82/cosmeticsEric Haszlakiewicz2020-04-1119-462/+454
|\ \ | |/ |/| Small cosmetics.
| * Remove multiple trailing newlines at EOF.Björn Esser2020-04-118-8/+0
| |
| * gitignore: Add build folder.Björn Esser2020-04-111-0/+1
| |
| * Clean trailing white-space.Björn Esser2020-04-1111-30/+30
| |
| * Fix line terminators to be UNIX.Björn Esser2020-04-114-430/+429
|/
* Update README.md to remove autoconf instructions in favor of cmake.Eric Haszlakiewicz2020-04-111-121/+75
|
* Merge pull request #572 from besser82/topic/besser82/cmake_fixesEric Haszlakiewicz2020-04-102-9/+18
|\ | | | | Small fixes to CMakeLists
| * CMake: Check whether BSYMBOLIC is supported by the linker.Björn Esser2020-04-102-6/+15
| | | | | | | | Linking with '-Bsymbolic-functions' is supported for ELF-binaries, only.
| * CMake: Build Doxygen documentation out-of-tree.Björn Esser2020-04-101-2/+2
| |
| * CMake: Fix appending of linker flags.Björn Esser2020-04-101-1/+1
| | | | | | | | There was a typo in `CMAKE_SHARED_LINKER_FLAGS`.
* | Merge pull request #573 from besser82/topic/besser82/coverageChen2020-04-111-2/+9
|\ \ | |/ |/| Fix coveralls submission.
| * Fix coveralls submission.Björn Esser2020-04-101-2/+9
|/ | | | | coveralls-cpp is dead and does not work anymore. Fortunately there is coveralls-lcov available.
* List the set of contributors since the 0.13 branchEric Haszlakiewicz2020-04-101-0/+31
|
View Lorry Controller Status