1172 Commits (bebda92febbec85f23462a5418937590106a083c)
 

Author SHA1 Message Date
  Hex052 bebda92feb
Merge 816b00c1c6 into 382f9462c2 4 years ago
  Eric Hawicz 382f9462c2
Merge pull request #726 from leongross/fix/test-cmake3.1 4 years ago
  Leon Gross 8be2ffdcd7 fix cmake version for tests 4 years ago
  Eric Hawicz 4fc44f32df
Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-free 4 years ago
  Juuso Alasuutari 9361d8d3a8 Fix use-after-free in json_tokener_new_ex() 4 years ago
  Eric Hawicz dc1ef7d566
Merge pull request #718 from Pawday/master 4 years ago
  Pawday e91e4cc9fb Setted cmake "uninstall" target to exist in unix like operating systems only 4 years ago
  Eric Haszlakiewicz f61f1a7a91 Add workaround for Visual Studio not knowing about "inline". 4 years ago
  Eric Haszlakiewicz db6a6cc2b2 Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid timeouts with Homebrew. 4 years ago
  Eric Haszlakiewicz 6a0df2609e Merge some old work to include (some of) PR #464 into the current master branch. 4 years ago
  Eric Haszlakiewicz 8c727e5ce1 Only define an "uninstall" target if it's not already defined (e.g. by projects that include json-c) 4 years ago
  HexTheDragon 816b00c1c6 Add new functions so any old things still work 4 years ago
  HexTheDragon 85ca6f8393 Keep `json_object_object_foreach` the same 4 years ago
  HexTheDragon 95225e6a32 Move a header back that shouldn't have been moved 4 years ago
  HexTheDragon 65e0969db0 Modifications so it compiles on Windows correctly 4 years ago
  HexTheDragon 2c9019f7ff Rename lh_string to json_key and move to json_object.h 4 years ago
  HexTheDragon 0a8f719eda Add additional tests and fix `test_null_keys_get` 4 years ago
  HexTheDragon c9ab2f338e Changes to tokener to allow null characters 4 years ago
  HexTheDragon afade9038a Edits to tests to reflect changes to API 4 years ago
  HexTheDragon 3c0a85c9e8 Additional changes to json to contain null characters 4 years ago
  HexTheDragon f230b25586 Changes to the hash table so add works (kinda not-really) 4 years ago
  HexTheDragon 03f897e574 Tests that try to show that can't get/add keys with embedded null characters 4 years ago
  Eric Hawicz be9671e48a
Merge pull request #714 from Hex052/clang-format_AfterCaseLabel 4 years ago
  Hex052 9dde931a1c
Add AfterCaseLabel to .clang-format 4 years ago
  Eric Haszlakiewicz 75bf657cc2 If inttypes.h is present, use it, even on Windows. 4 years ago
  Eric Haszlakiewicz 9ca50cf2f8 Issue #709: adjust some include guards to be a bit more json-c specific. 4 years ago
  Eric Hawicz 0b7e78c309
Merge pull request #706 from davidjmccann/master 4 years ago
  David McCann 00098efc96 Merge branch 'json-c:master' into master 4 years ago
  David McCann 9b53c92ea3 Check __STDC_VERSION__ is defined before checking its value 4 years ago
  Eric Hawicz cd7109f767
Merge pull request #696 from ssrlive/master 4 years ago
  Eric Hawicz 78e390a261
Merge pull request #701 from commodo/configurable-opts 4 years ago
  Alexandru Ardelean 8abeebc9b2 json_pointer: allow the feature to be disabled 4 years ago
  Alexandru Ardelean 1f8b64f62c tests: CMakeLists.txt: move test names to variable 4 years ago
  Eric Hawicz 94909840be
Merge pull request #700 from Philosoph228/werror-fix 4 years ago
  Philosoph228 9c0565100a
random_seed: fix unused variable for win32 build 4 years ago
  ssrlive ba181548bc To avoid target exe file export JSON functions. 4 years ago
  Eric Haszlakiewicz 041cef434a Add a DISABLE_EXTRA_LIBS option to skip using libbsd, per @neheb's request on issue #692/commit 0f61f692. 4 years ago
  Eric Haszlakiewicz f787810890 If arc4random is used, don't bother compiling in the other fallback methods since they'll never be used. Fixes PR#695 about unreachable code too. 4 years ago
  Eric Hawicz 7c859c54e4
Merge pull request #694 from ihsinme/patch-1 4 years ago
  ihsinme c456963110
Update json_object.c 4 years ago
  Eric Haszlakiewicz 0f61f6921b Iesue #692: use arc4random() if it's available (in libc on BSD systems, and libbsd on Linux). 4 years ago
  Eric Haszlakiewicz 69d650528d Keep the doc directory in the nodoc release tarball, just exclude its contents. 4 years ago
  Eric Hawicz 4754f47434
Merge pull request #674 from ploxiln/random_seed_err_continue 4 years ago
  Eric Hawicz 1fcb9e476b
Merge pull request #689 from neheb/patch-1 4 years ago
  Rosen Penev 987d3b2c86
fix compilation with clang 4 years ago
  Pierce Lopez 0fd3b7d316 random_seed: on error, continue to next method 5 years ago
  Eric Hawicz df27756491
Merge pull request #667 from stoeckmann/regression 5 years ago
  Tobias Stoeckmann 7af593c140 Fixed test1 regression. 5 years ago
  Eric Hawicz 785a94b7a2
Merge pull request #665 from stoeckmann/tokener 5 years ago
  Eric Hawicz eb08a92218
Merge pull request #660 from stoeckmann/arraylist 5 years ago