json-c

mirror/json-c

Fork 0

mirror of https://github.com/json-c/json-c.git synced 2026-03-19 04:59:06 +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

8d8a785bd2 Merge pull request #340 from commodo/fix-appveyor-build Eric Haszlakiewicz 2017-07-27 23:09:12 -04:00
d8fbfc7aa1 build,travis: drop -enable-strerror-override argument (no longer exists) Alexandru Ardelean 2017-07-19 15:22:36 +03:00
ddce7c28e4 strerror_override: add extern "C" and JSON_EXPORT specifiers for Visual C++ compilers Alexandru Ardelean 2017-07-19 15:10:10 +03:00
fcad0ec015 PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests. Eric Haszlakiewicz 2017-07-15 07:12:44 -07:00
730ab7b019 PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests. Eric Haszlakiewicz 2017-07-15 07:07:28 -07:00
40317f079e Allow USE_VALGRIND to be set to anything starting with 0, N or n to disable valgrind during tests. Eric Haszlakiewicz 2017-07-15 07:03:18 -07:00
c0b7d762b2 Merge pull request #336 from commodo/fix-tests Eric Haszlakiewicz 2017-07-13 22:39:01 -04:00
bc2e30453b build,travis: enable strerror override option in build Alexandru Ardelean 2017-07-13 10:24:27 +03:00
fb72160caf build: make strerror() override-able Alexandru Ardelean 2017-07-13 10:11:15 +03:00
85f57859fd configure.ac: check for uselocale function only on Linux platforms Alexandru Ardelean 2017-07-13 09:33:39 +03:00
7b9432d564 tests: fix leak in test_util_file ; found by cppcheck Alexandru Ardelean 2017-07-10 18:00:41 +03:00
effab3f91a travis,tests: run cppcheck only if it exists Alexandru Ardelean 2017-07-10 17:47:00 +03:00
9d47ae824c tests: compress test_utile_file with test_basic Alexandru Ardelean 2017-07-10 13:30:49 +03:00
ba8625a701 tests: add set -e specifier to bail early on build run Alexandru Ardelean 2017-07-10 12:01:56 +03:00
dd8dcb8228 Merge pull request #335 from commodo/build_status_travis Eric Haszlakiewicz 2017-07-11 00:16:12 -04:00
061afc7993 README.md: show build status tag from travis & appveyor. Alexandru Ardelean 2017-07-10 11:28:10 +03:00
b64402ede2 Move a variable declaration to the start of the block to work better with older compilers. Eric Haszlakiewicz 2017-07-09 16:08:29 -07:00
a14ada5730 Remove a spurious comma in configure.ac Eric Haszlakiewicz 2017-07-09 16:00:32 -07:00
33db761551 Updated expected test1 output which should have been included in commit fd9b3b2. Eric Haszlakiewicz 2017-07-09 15:22:53 -07:00
1d3e97f2ab Comment out the warning about racy random seed initialization in lh_char_hash(), if you're on a platform where it'll be triggered it just makes it a pain to build. Eric Haszlakiewicz 2017-07-09 15:13:02 -07:00
f7a44ad101 Add extra casts to void * to squash some warning on certain systems (e.g. CentOS w/ gcc 4.1.2). Eric Haszlakiewicz 2017-07-09 15:08:21 -07:00
7b7a76e161 Fix bad usage of strncat introduces in 1a94c70. Pointed out by @rouault in PR #331. Eric Haszlakiewicz 2017-07-09 15:04:18 -07:00
55ecae3e58 Eliminate static qualifiers on a couple local variables that were causing thread safety issues. Suggested by @rouault in PR #331. Eric Haszlakiewicz 2017-07-09 14:56:18 -07:00
5a99e527ff Reformat json_object_double_to_json_string_format() to have consistent spacing. Eric Haszlakiewicz 2017-07-08 20:33:28 -07:00
5e33dabda1 Issue #308: improve the build instructions in README.md to include the exact commands to run for installing prerequisites, as mentioned earlier on Issue #308. Eric Haszlakiewicz 2017-07-08 19:35:06 -07:00
fd9b3b2260 Issue #332: fix a long-standing bug in array_list_put_idx() where it would attempt to free previously free'd entries due to not checking the current array length. Add a test that triggers the problem to ensure it stays fixed. Eric Haszlakiewicz 2017-07-08 19:04:35 -07:00
7fd74fc7a3 Merge pull request #312 from Tailmon/master Eric Haszlakiewicz 2017-07-08 21:25:48 -04:00
4deed587e7 Merge pull request #319 from Dashlane/visual-studio-build Eric Haszlakiewicz 2017-07-08 21:24:55 -04:00
a3f97eeeeb Merge pull request #329 from commodo/rename-static-lib Eric Haszlakiewicz 2017-07-08 15:44:27 -04:00
db3115cee9 Merge pull request #330 from commodo/symlink_some_tests Eric Haszlakiewicz 2017-07-08 15:43:45 -04:00
cc201fdcaa Merge pull request #333 from besser82/bugfix/obsolete_macros_autotools Eric Haszlakiewicz 2017-07-08 15:17:17 -04:00
cec97ebc6f Replace obsolete AM_PROG_LIBTOOL Björn Esser 2017-07-03 12:17:36 +02:00
73636c2ed0 tests: symlink basic tests to a single file that has the common code Alexandru Ardelean 2017-06-22 09:53:30 +03:00
8f6ecbf37b build,cmake: set C_STANDARD 99 property to libjson-c-static Alexandru Ardelean 2017-06-19 18:12:03 +03:00
4fb2eefac2 build,cmake: rename libjson-c-static.a to libjson-c.a Alexandru Ardelean 2017-06-19 18:08:13 +03:00
a36396992d Merge pull request #321 from commodo/fix-cmake-vasprintf Eric Haszlakiewicz 2017-06-19 00:34:44 -04:00
e8e574fbe4 Issue #161: add a json_object_to_fd() function. Eric Haszlakiewicz 2017-06-18 18:44:45 +00:00
23e064ad29 Fix test_double_serializer expected output. Eric Haszlakiewicz 2017-06-18 18:34:41 +00:00
1a94c70336 Add a json_c_set_serialization_double_format() function to set the *library-wide* format for how doubles are written to a serialized JSON output. Eric Haszlakiewicz 2017-06-18 18:04:49 +00:00
8581806558 Make _set_last_err() non-static so it can be used outside of json_util.c Eric Haszlakiewicz 2017-06-04 18:25:51 +00:00
e76ea37772 Merge pull request #325 from rouault/fix_stack_overflow_in_json_object_double_to_json_string_format Eric Haszlakiewicz 2017-05-21 21:35:16 -04:00
2c2deb87f8 Fix stack buffer overflow in json_object_double_to_json_string_format() Even Rouault 2017-05-18 22:36:35 +02:00
f10a5ae4d7 .gitignore: add cmake generated files Alexandru Ardelean 2017-05-03 11:30:38 +03:00
4b5e39c89c build,cmake: generate both static and shared libjson Alexandru Ardelean 2017-05-03 11:59:31 +03:00
cfbbb23141 build,cmake: add _GNU_SOURCE to CFLAGS Alexandru Ardelean 2017-05-03 11:29:12 +03:00
a9f265d166 Fix library build with Visual Studio David Henot 2017-04-26 14:08:31 +02:00
d3f813a14e Fixed linkhash.c for MinGW Pablo Sanabria 2017-03-25 19:18:29 -03:00
2cda677d06 Fix CMake Build process for MinGW and MSYS2 Pablo Sanabria 2017-03-25 16:31:22 -03:00
6bd86d1044 Merge pull request #311 from jj1118/master Eric Haszlakiewicz 2017-03-26 03:52:57 +00:00
0f81ecf5f4 Fix error C3688 when compiling on Visual Studio 2015: invalid literal suffix 'PRId64'; literal operator or literal operator template 'operator ""PRId64' not found Jason Li 2017-03-24 14:53:25 +08:00
4e673656a1 Merge pull request #310 from marxin/fix-gcc7-warnings Eric Haszlakiewicz 2017-03-22 23:37:14 -04:00
014924ba89 Add FALLTHRU comment to handle GCC7 warnings. marxin 2017-03-21 08:42:11 +01:00
82f5a4ab29 Merge pull request #305 from alexanderst/master Eric Haszlakiewicz 2017-03-03 23:12:56 -05:00
175d934cff Fix compilation without C-99 option Alex 2017-03-02 10:57:49 +02:00
8c86207258 Add a few more cases to test_parse to provide some examples of how parsing works; should help address the questions raised in Issue #302. Eric Haszlakiewicz 2017-02-26 16:22:45 +00:00
d74b7eb144 Merge pull request #303 from yogo1212/tokener_h Eric Haszlakiewicz 2017-02-24 22:34:36 -05:00
482e771af1 fix doc in tokener header file Leon M. George 2017-02-20 04:41:55 +01:00
3948fcad2d Issue #300: Cast size_t values to int instead of unsigned long long to work around broken behavior of MinGW. Eric Haszlakiewicz 2017-02-05 17:00:35 +00:00
bad6c9a427 Issue #300: Some platforms, such as MinGW, don't have ETXTBSY and ENOTBLK, so skip those there. Eric Haszlakiewicz 2017-02-05 04:43:54 +00:00
9a64fd7d55 Issue #300: Use %p instead of %lx in test_util_file since some platforms' pointers are larger than "unsigned long". Also, there's no need to worry about output consistency here, since it'll be different anyway due to different pointer values. Eric Haszlakiewicz 2017-02-05 04:37:27 +00:00
91977159ee Add cast to int in calls to isdigit() since some platforms complain about char being used as an array index. Eric Haszlakiewicz 2017-02-05 04:34:05 +00:00
3fab117e4e Merge pull request #299 from qlyoung/perf-improvements Eric Haszlakiewicz 2017-02-04 11:13:14 -05:00
f6f852fd93 Restore sprintbuf(), add macro for string literals Quentin Young 2017-02-03 21:43:59 +00:00
75825a9f01 Use strdup instead of strndup in test1.c, there's no need for the latter because json_object_to_json_string_length() will always return a properly sized string. Eric Haszlakiewicz 2017-02-03 17:10:27 +00:00
9ff0f4987f Improve json_object -> string performance Quentin Young 2017-02-02 17:16:26 +00:00
8157784483 Issue #295: also check if size_t is the size of long long, to help support 64-bit Windows platforms. Eric Haszlakiewicz 2017-01-07 22:55:31 -05:00
177c401e02 Ignore tests/test_float Eric Haszlakiewicz 2016-12-18 14:35:06 -05:00
0a010a59eb Change a memcpy that should be a memmove within json_pointer_get, and fix memory leaks in of one the json_pointer tests. Eric Haszlakiewicz 2016-12-18 14:33:41 -05:00
779b77a164 Note some minimum versions needed for autoconf, etc... Eric Haszlakiewicz 2016-12-12 23:01:20 -05:00
a443b9f7e7 Issue#292: bump the required version of configure listed in configure.ac so a more useful error message is generated, rather than failing later because the extra macros from ./autoconf-archive/m4/ didn't get loaded. Eric Haszlakiewicz 2016-12-11 19:18:33 -08:00
1e4824a841 Merge pull request #289 from jgerhards/i-278 Eric Haszlakiewicz 2016-12-04 20:52:33 -05:00
61db4cfac5 testbench: add test for floating point representation Jan Gerhards 2016-11-27 11:50:48 +01:00
ca7a1973e2 bugfix: floating point representaion without fractional part Jan Gerhards 2016-11-27 11:47:00 +01:00
d050f1e622 Merge pull request #287 from commodo/json_pointer_va_args Eric Haszlakiewicz 2016-11-24 15:03:50 -05:00
47f32a76ef vasprintf_compat.h: spin-off this compat header ; use math_compat.h as template Alexandru Ardelean 2016-11-16 17:04:41 +02:00
8cb86a583a strdup_compat.h: re-spin this compat header ; use math_compat.h as template Alexandru Ardelean 2016-11-16 17:00:45 +02:00
c0da680f13 test_json_pointer: update test with a few printf variants Alexandru Ardelean 2016-11-16 16:22:13 +02:00
742e059da1 json_pointer: add json_pointer_getf/setf() function variants Alexandru Ardelean 2016-11-16 11:55:41 +02:00
97dd7d5103 json_pointer.c: fix whitespace Alexandru Ardelean 2016-11-16 11:34:29 +02:00
8e12f4a21c Merge pull request #285 from ebassi/revert-strdup-compat Eric Haszlakiewicz 2016-11-09 09:56:58 -05:00
7601f20d70 Revert "compat/strdup.h: move common compat check for strdup() to own file" Emmanuele Bassi 2016-11-07 20:51:11 +00:00
e8ce1db471 Merge pull request #283 from commodo/json_pointer Eric Haszlakiewicz 2016-11-04 11:48:30 -04:00
ee7fc26de1 tests: add test_json_pointer test Alexandru Ardelean 2016-11-01 18:07:03 +02:00
2fbdee19da tests/strerror_override.c: fix compilation error Alexandru Ardelean 2016-11-01 17:49:28 +02:00
0e91183300 json_pointer: add first revision Alexandru Ardelean 2016-10-25 17:39:16 +03:00
aaba8c1080 compat/strdup.h: move common compat check for strdup() to own file Alexandru Ardelean 2016-10-26 10:37:50 +03:00
d4899bd4d5 Handle NULL objects in json_object_get_userdata() by returning NULL, but abort in json_object_set_userdata() since we can't actually do anything with the userdata. Eric Haszlakiewicz 2016-10-29 15:42:36 -04:00
f8132f932d Issue #280: add a few assert() calls to ensure objects are of the appropriate type. Eric Haszlakiewicz 2016-10-29 15:31:31 -04:00
33339ae595 Use json_visit() to clear the serializer data set when parsing so the output from test_parse reflects the actual values parsed. Eric Haszlakiewicz 2016-10-29 15:13:16 -04:00
ecdc14f535 Add a json_c_visit() function to provide a way to iterate over a tree of json-c objects. Eric Haszlakiewicz 2016-10-29 15:01:20 -04:00
7e12b9f47c Fix broken key-order test in test_compare. Eric Haszlakiewicz 2016-10-10 00:13:39 -04:00
80150a18d3 Merge pull request #272 from sgerbino/master Eric Haszlakiewicz 2016-10-08 13:13:33 -04:00
818156f6f7 Merge pull request #277 from ALLTERCO/json_object_set_xxx Eric Haszlakiewicz 2016-10-08 12:08:53 -04:00
be63ba99ca try restore windows automated builds Stoian Ivanov 2016-10-07 22:54:06 +03:00
a26305d428 fix compiler warning for int sizes Stoian Ivanov 2016-10-07 01:07:34 +03:00
e518b22b72 string set and tests Stoian Ivanov 2016-10-07 00:51:24 +03:00
9a313f767f gitignore test; add double value set checks in test Stoian Ivanov 2016-10-06 23:32:19 +03:00
6a0667567d some simple tests Stoian Ivanov 2016-10-06 23:16:29 +03:00
36a28fcb0c Issue #275: fix out of bounds read when handling unicode surrogate pairs. Eric Haszlakiewicz 2016-10-05 23:15:51 -04:00
05f025c075 some basic set Stoian Ivanov 2016-10-05 23:55:46 +03:00