json-c

mirror/json-c

Fork 0

mirror of https://github.com/json-c/json-c.git synced 2026-03-18 04:29:07 +08:00

Commit Graph

Select branches

Hide Pull Requests

disallow-control-chars

gh-pages

issue808-ios-build

json-c-0.10

json-c-0.11

json-c-0.12

json-c-0.13

json-c-0.14

json-c-0.15

json-c-0.16

json-c-0.17

json-c-0.18

json_object-split

master

#104

#104

#105

#105

#106

#106

#107

#109

#11

#11

#112

#113

#113

#119

#119

#12

#12

#121

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#132

#133

#141

#144

#145

#145

#148

#148

#149

#150

#151

#153

#155

#156

#16

#16

#162

#162

#163

#164

#164

#168

#171

#174

#177

#179

#18

#180

#182

#183

#184

#184

#186

#19

#19

#191

#193

#194

#194

#196

#198

#199

#20

#20

#200

#208

#208

#209

#21

#21

#210

#211

#211

#216

#218

#219

#220

#222

#223

#23

#23

#230

#231

#231

#232

#233

#234

#238

#239

#24

#24

#241

#241

#243

#248

#248

#249

#25

#25

#250

#251

#252

#253

#254

#255

#26

#26

#262

#262

#267

#27

#27

#272

#273

#274

#277

#282

#282

#283

#285

#287

#288

#288

#289

#29

#29

#290

#290

#294

#294

#299

#30

#30

#303

#305

#31

#31

#310

#311

#312

#319

#32

#32

#321

#325

#328

#329

#33

#33

#330

#331

#331

#333

#335

#336

#34

#34

#340

#344

#345

#346

#354

#354

#355

#355

#359

#360

#361

#362

#362

#363

#365

#37

#37

#372

#373

#38

#38

#381

#383

#383

#384

#386

#387

#388

#389

#390

#391

#392

#393

#399

#4

#4

#402

#410

#415

#42

#42

#420

#421

#428

#431

#432

#433

#433

#434

#436

#44

#44

#441

#443

#443

#444

#45

#45

#450

#452

#453

#454

#455

#456

#457

#458

#459

#461

#462

#464

#467

#468

#471

#473

#474

#476

#483

#484

#485

#490

#491

#493

#495

#496

#497

#499

#500

#501

#505

#51

#51

#510

#511

#512

#514

#515

#516

#517

#519

#52

#52

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#533

#536

#537

#538

#541

#542

#543

#544

#545

#546

#547

#55

#55

#551

#553

#555

#556

#558

#56

#56

#561

#562

#563

#564

#565

#566

#567

#568

#571

#572

#573

#575

#576

#577

#578

#579

#58

#58

#580

#581

#582

#583

#583

#584

#585

#587

#589

#59

#59

#590

#591

#592

#595

#597

#6

#6

#60

#60

#602

#603

#606

#607

#608

#609

#61

#61

#610

#611

#612

#613

#614

#617

#618

#619

#62

#62

#620

#622

#624

#625

#626

#627

#628

#629

#632

#633

#634

#639

#64

#640

#646

#648

#65

#65

#650

#651

#653

#655

#656

#657

#659

#66

#66

#660

#661

#662

#663

#664

#665

#667

#669

#670

#671

#673

#674

#675

#679

#680

#680

#689

#694

#696

#7

#7

#70

#70

#700

#701

#702

#703

#704

#706

#71

#71

#714

#715

#715

#716

#717

#718

#722

#724

#726

#727

#728

#729

#73

#73

#732

#734

#735

#737

#739

#740

#740

#741

#742

#744

#745

#746

#748

#749

#750

#751

#752

#754

#755

#757

#758

#759

#760

#765

#769

#771

#772

#776

#777

#779

#78

#78

#781

#782

#783

#784

#789

#790

#794

#796

#8

#8

#80

#80

#802

#803

#804

#805

#805

#810

#813

#822

#825

#826

#827

#828

#831

#832

#832

#834

#835

#837

#839

#845

#846

#847

#849

#852

#858

#859

#860

#861

#864

#866

#871

#872

#873

#877

#878

#879

#88

#88

#882

#883

#884

#888

#89

#89

#890

#890

#893

#895

#898

#899

#90

#90

#900

#901

#903

#904

#905

#906

#907

#908

#910

#913

#915

#917

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

json-c-0.10-20120530

json-c-0.11-20130402

json-c-0.12-20140410

json-c-0.12.1-20160607

json-c-0.13-20171207

json-c-0.13.1-20180305

json-c-0.14-20200419

json-c-0.15-20200726

json-c-0.16-20220414

json-c-0.17-20230812

json-c-0.18-20240915

f2eac07129 doxygen can't handle html on heading, split that to separate lines https://github.com/doxygen/doxygen/issues/10466 Eric Hawicz 2024-03-29 18:45:22 -04:00
e93ae70417 Fix issue #854: Set error=json_tokener_error_memory in json_tokener_parser_verbose() when allocating the tokener fails. Eric Hawicz 2024-03-29 18:09:12 -04:00
0bc2dd5e60 Merge pull request #852 from fedefrancescon/docs/micro-typo-fix Eric Hawicz 2024-03-02 17:31:24 -05:00
9c44c7ed52 docs: micro typo in json_object_get doc Federico Francescon 2024-03-02 22:41:10 +01:00
401249cbdf Merge pull request #831 from neheb/1 Eric Hawicz 2024-02-08 08:11:57 -05:00
66f7869219 rename WIN32 to _WIN32 Rosen Penev 2023-09-13 20:51:49 -07:00
dabed80523 Merge pull request #849 from rouault/random_seed_toctou Eric Hawicz 2024-01-08 12:45:39 -05:00
f6c8eba84e random_seed.c: add a Coverity Scan suppression Even Rouault 2024-01-07 20:55:35 +01:00
76f819e51d Merge pull request #846 from evo-i/CMP0153 Eric Hawicz 2023-12-17 07:23:07 -05:00
eef983b1df Update CMakeLists.txt evo 2023-12-17 11:19:20 +03:00
c0cf4bc23b Update CMakeLists.txt evo 2023-12-17 00:32:21 +03:00
e85c8ada54 Fix ECHO_OUTPUT_VARIABLE evo 2023-12-17 00:23:51 +03:00
2c84476c77 [CMP0153](https://cmake.org/cmake/help/latest/policy/CMP0153.html) evo 2023-12-12 16:28:41 +03:00
407ddb4350 Issue #842 - fix one particular sign conversion warning. There are many others that show up if we were to add -Wsign-conversions, but this is the only one using a literal constant. Eric Haszlakiewicz 2023-11-30 13:59:13 +00:00
33337523f5 Merge pull request #839 from ffontaine/master Eric Hawicz 2023-11-08 18:11:13 -05:00
7ff7eab603 json_pointer.c: initialize idx Fabrice Fontaine 2023-11-08 22:42:48 +01:00
88bce2b38e Merge pull request #837 from HansolChoe/fix-tokener-parse-ex-fuzzer Eric Hawicz 2023-10-19 07:49:32 -04:00
a907f7dd1b tokener_parse_ex_fuzzer: add type checking for parsed object HansolChoe 2023-10-19 16:33:01 +09:00
ad8b8afa7d Take 2 fixing the placement of json_tokener_error_memory in the enum. (json_tokener_error_size is an actual error, *not* a measure of the size of the enum!) Eric Hawicz 2023-09-22 22:26:21 -04:00
4186537557 Merge pull request #827 from robert-pang/master Eric Hawicz 2023-09-11 00:13:45 +02:00
9ff6b68baf Merge pull request #826 from emlix/cmake-policies Eric Hawicz 2023-09-11 00:10:55 +02:00
1a7defaa69 Fix variable and API names in tokener_parse_ex_fuzzer.cc to resolve build issue. Robert Pang 2023-09-05 13:58:51 -07:00
c4a615a052 CMake: request all policies up to CMake 3.12 being set to NEW Rolf Eike Beer 2023-09-05 14:31:24 +02:00
159822dd8a CMake: request consistent minimum version Rolf Eike Beer 2023-09-05 14:27:27 +02:00
990acb4e19 CMake: remove needless policy setting Rolf Eike Beer 2023-09-05 12:14:46 +02:00
b62ea12bd0 Update the doc links to point at 0.17 Eric Haszlakiewicz 2023-08-12 19:13:30 +00:00
106988e3ae Add the 0.17 docs. Eric Haszlakiewicz 2023-08-12 19:10:14 +00:00
502522a93d Update the master branch to version 0.17.99 Eric Haszlakiewicz 2023-08-12 19:08:59 +00:00
b4c371fa0c Generate docs for the 0.17 release json-c-0.17-20230812 Eric Haszlakiewicz 2023-08-12 19:00:16 +00:00
21c70bd767 Bump version to 0.17 Eric Haszlakiewicz 2023-08-12 18:59:13 +00:00
12ea386989 Add an abi-check.sh script that shows how to run the abi-compliance-checker, update release creation steps slightly. Eric Hawicz 2023-08-12 14:34:35 -04:00
6dd8618170 Also fix messages returned from json_tokener_error_desc() (broke due to the ordering change of enum json_tokener_error) Eric Haszlakiewicz 2023-08-12 18:52:32 +00:00
3dad6941da Move the json_tokener_error_memory entry to the end of enum json_tokener_error to restore binary compatibility with 0.16 Eric Hawicz 2023-08-12 13:54:50 -04:00
f7e9d8e216 Update the AUTHORS file and add issues_closed_for_0.17.md for the upcoming 0.17 release Eric Hawicz 2023-08-12 13:53:27 -04:00
85ed501a3d Update the ChangeLog for 0.17 based on notable commits since 0.16 Eric Hawicz 2023-08-08 17:31:38 -04:00
077661f3d1 Fix issue #823: add back json_number_chars, but only because it's part of the public API. Eric Hawicz 2023-08-06 15:35:04 -04:00
87127d31c6 Merge pull request #679 from GitMensch/patch-1 Eric Hawicz 2023-08-05 22:32:37 -04:00
1ee12100b6 PR #679: add workaround for old compilers w/o stdint.h (i.e. VS2008 and earlier) Eric Hawicz 2023-08-05 22:11:30 -04:00
0bcfb6bc84 Merge pull request #822 from SSharshunov/master Eric Hawicz 2023-08-04 11:47:23 -04:00
bef40a342e Added option to disable app build Sergey Sharshunov 2023-08-04 19:46:50 +05:00
2316dbae85 Merge pull request #702 from commodo/json_patch Eric Hawicz 2023-07-31 22:19:30 -04:00
612ba56f06 Don't export json_pointer_get_internal, move json_object_array_insert_idx and json_patch_apply to the JSONC_0.17 section in json-c.sym Eric Hawicz 2023-07-29 21:45:16 -04:00
469bc0e4bb Work around a somewhat misleading warning about "a function declaration without a prototype is deprecated in all versions of C" in test1.c Eric Hawicz 2023-07-29 11:22:12 -04:00
ce3184243a Fix json_patch_apply handling of removing the whole document (i.e. "path":""). Enable all disabled tests, add a few more including some with null documents. Eric Hawicz 2023-07-28 22:12:51 -04:00
9dbf2880cc Adjust the behavior of the args passed to json_patch_apply to make it easier to do in place modifications, and add a struct json_patch_error to report more details on failures. Eric Hawicz 2023-07-26 22:01:04 -04:00
a14a3a680c Fix an uninitialized memory access in json_pointer. Add comments describing when the fields of the internal struct json_pointer_get_result are valid. Eric Hawicz 2023-07-26 18:15:07 -04:00
efc530594b Create a json_pointer_private.h and move a few things there, fix test warnings, note array_list_insert_idx is private. Eric Hawicz 2023-07-16 10:48:20 -04:00
3b8363fcdc tests: test_json_patch: add test suite for JSON patch Alexandru Ardelean 2021-04-20 15:47:18 +03:00
538b046884 json_patch: add first implementation only with patch application Alexandru Ardelean 2021-04-24 17:00:13 +03:00
e4d9fbd52a json_pointer: split json_pointer_set_with_array_cb() Alexandru Ardelean 2021-04-23 21:56:29 +03:00
1c38dea651 json_pointer: move array out-of-bounds check outside of is_valid_index() Alexandru Ardelean 2021-04-23 21:19:49 +03:00
5a46a3b76d json_pointer: introduce json_pointer_get_internal() for internal usage Alexandru Ardelean 2021-04-20 16:23:47 +03:00
43d3118935 json_pointer: convert index to size_t type Alexandru Ardelean 2021-04-24 17:06:17 +03:00
d5c5b2caec tests: test1: add test cases for json_object_array_insert_idx() Alexandru Ardelean 2021-04-20 16:07:26 +03:00
a86d7a8f5a json_object: introduce json_object_array_insert_idx() API function Alexandru Ardelean 2021-04-16 16:12:22 +03:00
5568916eb1 json_pointer: fix comments about printf() variants of set/get() Alexandru Ardelean 2021-04-22 11:19:07 +03:00
71d845e819 Issue #668: add the option to specify "cmake -DUSELOCALE_NEEDS_FREELOCALE=1" to work around a bug in older versions of FreeBSD (<12.4). Eric Hawicz 2023-07-30 13:38:15 -04:00
c8b0a90e95 Issue #808: turn off -Wshorten-64-to-32 for clang builds (aka iOS builds) to workaround "implicit conversion loses integer precision" warnings. Eric Hawicz 2023-07-30 11:38:01 -04:00
fa7308b3de Run travis builds using iOS flags, to attempt to reproduce Issue #808. issue808-ios-build Eric Hawicz 2023-07-30 10:23:21 -04:00
9b36c72945 Merge pull request #772 from cosmo-ray/color Eric Hawicz 2023-07-13 18:04:48 -04:00
9803032b9d add JSON_C_TO_STRING_COLOR option Matthias Gatto 2022-06-02 17:10:21 +02:00
bdfdb5fe10 Skip apps when we're included in someone else's build. Inspired by ssrlive in PR #813. Eric Hawicz 2023-07-06 20:56:49 -04:00
11311ed2a3 Fix the -f option to apps/json_parse, add a -F <arg> option to specify arbitrary flags to pass to json_object_to_json_string_ext(). Eric Hawicz 2023-07-04 12:00:31 -04:00
e9d3ab209a Merge pull request #759 from c3h2-ctf/truncation Eric Hawicz 2023-07-04 11:45:57 -04:00
4d529f92dc Issue #688: Only exclude generated doc/* files, keep the CMakeLists.txt, etc... so the nodoc tarball can still be built. Eric Haszlakiewicz 2023-07-01 18:02:00 +00:00
aadde421a5 Merge pull request #625 from besser82/topic/besser82/json-c-0.13/rdrand_fixes json-c-0.13 Eric Hawicz 2023-06-28 18:01:58 -04:00
5a310ba1a6 Merge pull request #624 from besser82/topic/besser82/json-c-0.14/rdrand_fixes json-c-0.14 Eric Hawicz 2023-06-28 18:01:39 -04:00
188d1e3dda Merge pull request #612 from besser82/topic/besser82/json-c-0.11/CVE-2020-12762 json-c-0.11 Eric Hawicz 2023-06-28 17:50:55 -04:00
d0f32a5a43 Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests. That hasn't been needed since since commit 6068d3f, which changed that code to check an env var instead ("_JSON_C_STRERROR_ENABLE"). Fixes issue #812, about dup symbols in static builds with clang. Eric Haszlakiewicz 2023-03-28 23:08:39 +00:00
efd536af48 Merge pull request #810 from dijonkitchen/patch-1 Eric Hawicz 2023-03-10 14:54:44 -05:00
4d5507f5dc docs: update to Internet Standard reference JC (Jonathan Chen) 2023-03-10 11:10:29 -05:00
d1716fe431 Bump up the minimum cmake version to 3.9. This gets us up to a version that supports features we're already using (i.e. add_compile_options), but stops short of a cmake that requires c++11, which some OSes still don't support. Closes issue #774 Eric Haszlakiewicz 2023-02-23 01:01:14 +00:00
1741bcd3ea Issue #570: note brief instructions for building on Android. Eric Haszlakiewicz 2023-01-05 00:25:09 +00:00
343f24f920 Merge pull request #804 from yrashk/cmp-0042 Eric Hawicz 2022-12-27 09:32:33 -05:00
6ec5e5842d Merge pull request #803 from yrashk/patch-2 Eric Hawicz 2022-12-27 09:26:30 -05:00
b6ba9429d0 Merge pull request #802 from yrashk/patch-1 Eric Hawicz 2022-12-27 09:25:58 -05:00
3cc0c47221 Problem: cmake 3.25.1 warns about CMP0042 not being set Yurii Rashkovskii 2022-12-23 14:59:59 -08:00
7b971b52aa Problem: confusing error message in snprintf_compat.h Yurii Rashkovskii 2022-12-23 14:35:36 -08:00
debe8b70b7 Problem: modern CMake warns about version 2.8 Yurii Rashkovskii 2022-12-23 14:33:31 -08:00
79c147203e Merge pull request #796 from fedefrancescon/test-add-int-get Eric Hawicz 2022-11-16 22:23:11 -05:00
1a2fdc49e7 Fixed test_int_get expected output Federico Francescon 2022-11-16 01:33:02 +01:00
b1fb1508ee Added basic tests for json_object_get_int, json_object_get_int64, json_object_get_uint64 Federico Francescon 2022-11-16 00:49:18 +01:00
bc35549f90 Update expected output for test_parse, missed in the previous commit. Eric Haszlakiewicz 2022-10-30 19:42:42 +00:00
d6f46ae104 Explicitly check for integer overflow/underflow when parsing integers with JSON_TOKENER_STRICT. Eric Haszlakiewicz 2022-10-30 19:29:15 +00:00
c50bf9df9c Apply same EINVAL handling to json_parse_uint64() as was done for json_parse_int64(). Document that overflow/underflow for these functions is not an error, but sets errno=ERANGE. Eric Haszlakiewicz 2022-10-30 03:25:32 +00:00
57bef5edc4 Issue #792 - set errno=EINVAL if parsing the string in json_parse_int64 fails, to match the docs for json_object_get_int. Eric Haszlakiewicz 2022-10-26 02:19:38 +00:00
777dd06be8 Merge pull request #790 from Sarcares/patch-1 Eric Hawicz 2022-09-13 22:15:48 -04:00
84248a7884 Small update to README file Luca Mannella 2022-09-12 17:29:47 +02:00
aff2b83a07 Note that the current release is 0.16 Eric Haszlakiewicz 2022-08-26 23:29:44 +00:00
81f0807b63 Merge pull request #784 from rouault/get_time_seed_coverity_scan_silence Eric Hawicz 2022-08-16 18:10:06 -04:00
57ea393004 get_time_seed(): silence warning emitted by Coverity Scan static analyzer Even Rouault 2022-08-16 11:11:55 +02:00
9417f4e726 Merge pull request #783 from kraj/master Eric Hawicz 2022-08-14 08:19:19 -04:00
257b29c991 json_pointer.c: Move idx_val declaration to top of function Khem Raj 2022-08-14 00:46:28 -07:00
d1deed499f json_inttypes.h: Define ssize_t on windows platforms Khem Raj 2022-08-13 21:45:11 -07:00
6eca65617a Fix build with clang-15+ Khem Raj 2022-08-13 20:37:03 -07:00
ac4dfa44cb Merge pull request #782 from DimitriPapadopoulos/codespell Eric Hawicz 2022-08-13 09:43:50 -04:00
9462c0a7b5 Fix typos found by codespell Dimitri Papadopoulos 2022-08-13 15:47:40 +03:00
bdd5e03d6e Apply some of the fixes from PR #740, although by using size_t instead of castings. Eric Haszlakiewicz 2022-07-31 19:26:12 +00:00
4b0c6de760 Merge pull request #757 from c3h2-ctf/big Eric Hawicz 2022-07-31 14:27:32 -04:00
253a5fa99d Issue #705: disable locale handling when building for a uClibc system because its duplocale() function (intentionally) crashes. Eric Haszlakiewicz 2022-07-30 20:27:35 +00:00