mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 16:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,470 Commits 16 Branches 12 Tags
7ee487cc613b6831a3bb2d649dafb69f4bdff11f
Commit Graph
1470 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Even Rouault 86dd55a74a Fix potential out-of-bounds read in json_tokener_error_desc 
Found by Coverity. The number of elements of an array 'ar' is found by
sizeof(ar)/sizeof(ar[0]) and not sizeof(ar)

76const char *json_tokener_error_desc(enum json_tokener_error jerr)
 77{
 78        int jerr_int = (int)jerr;

1. Condition "jerr_int < 0", taking false branch

2. Condition "jerr_int > 112 /* (int)sizeof (gdal_json_tokener_errors) */", taking false branch
 79        if (jerr_int < 0 || jerr_int > (int)sizeof(json_tokener_errors))
 80                return "Unknown error, invalid json_tokener_error value passed to json_tokener_error_desc()";

CID 1076806 (#1 of 1): Out-of-bounds read (OVERRUN)3. overrun-local: Overrunning array "gdal_json_tokener_errors" of 14 8-byte elements at element index 112 (byte offset 896) using index "jerr" (which evaluates to 112).
 81        return json_tokener_errors[jerr];
 82}
 2013-09-08 11:31:38 +02:00
Remi Collet 4039f91cab trailing char not allowed in strict mode 2013-08-23 13:40:01 +02:00
Remi Collet 87fa32dfe0 no comment in strict mode 2013-08-21 15:41:40 +02:00
Pascal Bach 20e4708c8a Update json_util 
filename should be passed as const char* to functions
json_object_to_file and json_object_to_file
 2013-08-13 18:27:02 +02:00
Even Rouault 1a957c2edc Remove redefinition of strndup() which is no longer used in the codebase 2013-08-12 20:49:19 +02:00
Even Rouault 6c4bb3840c Add extern to json_object_set_serializer so that it gets exported (Windows fix) 2013-08-11 01:18:17 +02:00
Remi Collet a07ef3d197 no single-quote string in strict mode 2013-08-06 10:41:14 +02:00
Taneli Mielikainen c5523a17e8 fixing problem that isinf(-Inf) can be 1 or -1 2013-08-04 00:21:58 +03:00
Eric Haszlakiewicz b3bce4d594 Eliminate use of MC_ABORT in json-c code, and mark MC_ABORT/mc_abort deprecated. 
Also adjust an error message in json_util to make it unique.  Fixes #87.
 2013-06-29 15:31:18 -05:00
Eric Haszlakiewicz be002fbb96 Issue#84: explicitly remove old headers and include/json directory so creating the compat symlink can work. 2013-06-29 15:21:04 -05:00
Eric Haszlakiewicz c62965660b Fix the _MSC_VER check so it compiles on non-windows compilers. Issue#91 2013-06-23 19:12:14 -05:00
Eric Haszlakiewicz 5e8df40523 Mention that libtoolize is needed if you're not using a release tarball. 2013-06-23 18:55:02 -05:00
Eric Haszlakiewicz d032aad1f4 Minor spell check. 2013-06-19 09:14:19 -05:00
Eric Haszlakiewicz 8b1bdbb94d Merge pull request #90 from remicollet/issue-strict 
in strick mode, number must not start with 0
 2013-06-19 07:13:21 -07:00
Eric Haszlakiewicz 98a62a7652 Merge pull request #89 from ayanes/master 
Support NaN and Infinity
 2013-06-18 21:18:27 -07:00
Eric Haszlakiewicz b6539d6e90 Merge pull request #88 from weltling/master 
Several MSVC fixes
 2013-06-18 21:16:04 -07:00
Remi Collet e9ee4ae18a in strick mode, number must not start with 0 2013-06-13 13:40:01 +02:00
Adrian Yanes d086e2018c Fixes for Infinity and NaN 
Although JSON RFC does not support NaN or Infinity
as numeric values ECMA 262 section 9.8.1 defines
how to handle these cases as strings
 2013-06-12 19:48:00 -07:00
Anatol Belski 990fa8e3ee Fix C89 compat needed by MSVC 2013-06-04 20:18:28 +02:00
Anatol Belski ed819fb926 snprintf definition is needed here, too 2013-06-04 20:18:05 +02:00
Anatol Belski 48ba6b8c06 fixe int32_t definition for VC11 
int32_t is nowhere in msvc, so the version check could be even removed
 2013-06-04 20:17:12 +02:00
Eric Haszlakiewicz e48a25cfbb Issue #76: use old style comment to allow json_object_iterator.h to build in ansi mode. 2013-04-30 09:47:19 -05:00
Eric Haszlakiewicz e843616cc6 Fill in the instructions for update the gh-pages branch. 2013-04-02 21:36:28 -05:00
Eric Haszlakiewicz 4207147c24 Bump the versions for the non-release branch; add a placeholder section to the change log. 2013-04-02 21:22:59 -05:00
Eric Haszlakiewicz 20db5a4e84 Fill in a number of missing steps in the release process. 2013-04-02 21:21:38 -05:00
Eric Haszlakiewicz 7ca1e523f0 Merge branch 'master' of https://github.com/json-c/json-c 2013-03-31 20:58:54 -05:00
Eric Haszlakiewicz 0e81b21dc8 Bump up the version in the release checklist to 0.11 2013-03-31 20:58:30 -05:00
Eric Haszlakiewicz eee744cd7e Update the changelog with changes since the 0.10 release. 2013-03-31 20:57:08 -05:00
Eric Haszlakiewicz f1b684971d Update config.h.in to add the HAVE_SETLOCALE and HAVE_LOCALE_H lines. 2013-03-31 20:34:28 -05:00
Eric Haszlakiewicz e8161a11bb Issue #15: add a way to set a JSON_TOKENER_STRICT flag to forbid commas at the end of arrays and objects. 2013-03-31 20:05:36 -05:00
Eric Haszlakiewicz 889400d946 Merge pull request #73 from ghazel/master 
one definition of json_object_object_foreach only works on c99 and later
 2013-03-23 17:06:03 -07:00
Greg Hazel 88bf1c9960 one definition of json_object_object_foreach only works on c99 and later 2013-03-19 16:26:12 -07:00
Eric Haszlakiewicz 5ec65e43b2 Merge pull request #71 from WillDignazio/master 
Fix Broken Build, Check ADVANCE_CHAR
 2013-03-15 21:19:48 -07:00
William Dignazio 32eddd66f5 Fix broken build by using ADVANCE_CHAR macro return. 
We forget to check or use the return value of the ADVANCE_CHAR macro,
and upon compilation an error is thrown because of its lack of use. This
patch checks to see if the macro was successful, and if not replaces the
offending character with a replacement.
 2013-03-06 20:18:14 -05:00
William Dignazio bb492d4d69 Rename misnomer POP_CHAR to PEEK_CHAR. 
While parsing token data, we use the POP_CHAR macro to 'peek' at
character data. This behaviour is noted in the comments for the macro,
yet the definition is left as 'pop'. Changing to PEEK_CHAR does not
imply that the character being observed is removed.
 2013-03-06 12:29:33 -05:00
Eric Haszlakiewicz b64d5ab966 Merge pull request #70 from tg--/master 
rename AM_CONFIG_HEADER to AC_CONFIG_HEADER
 2013-03-03 20:34:34 -08:00
Eric Haszlakiewicz 1aa29b655a Issue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99 also implies -ansi, which causes warnings and build breakage. 2013-03-03 22:26:28 -06:00
Thomas Gstädtner 36ec47db49 configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER 
the former has been deprecated and does not work on newer autoconf
versions.
 2013-03-03 00:36:32 +01:00
Eric Haszlakiewicz 94aeed2ecd Include the test_locale test in the tests that run. 2013-02-26 21:14:07 -06:00
Eric Haszlakiewicz 5b36a432c8 Merge branch 'remicollet-issue-float' 
Conflicts:
	json_util.c
 2013-02-26 21:09:10 -06:00
Eric Haszlakiewicz 9b64c05ff9 Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test. 2013-02-21 12:32:29 -06:00
Eric Haszlakiewicz bfb329223a Add a runtime check to see if parse_int64 needs to workaround sscanf bugs. If that workaround is not needed parsing is nearly twice as fast. 2013-02-09 17:35:33 -06:00
Eric Haszlakiewicz ca8b27d183 Enable -Werror and fix a number of minor warnings that existed. 2013-02-09 16:35:24 -06:00
Eric Haszlakiewicz 92d289f5d3 Add a comment briefly describing json_object_object_length() 2013-02-09 16:18:05 -06:00
Eric Haszlakiewicz c6b399194d Merge pull request #62 from ghazel/master 
json_object_object_length
 2013-02-09 14:14:33 -08:00
Eric Haszlakiewicz ebeb6a40c9 Merge pull request #66 from ichernev/fix-test-parse 
Fixed test_parse for \f
 2013-02-09 13:59:51 -08:00
Iskren Chernev 78b089bc1e Fixed test_parse for \f 2013-01-28 19:06:49 -08:00
Greg Hazel cca74c6de6 add json_object_object_length 2013-01-11 01:36:55 -08:00
Eric Haszlakiewicz 3ae296f694 Merge pull request #60 from ghazel/master 
rename _errno
 2013-01-09 15:26:42 -08:00
Alexander Klauer 2be921d883 Fixed json_object_object_add(). 
* Return value of json_object_object_add() changed from void to int.
  Return value now indicates success or failure.

* Check whether allocations are successful.

* Do not exit program from within the library.
 2013-01-08 14:24:21 +01:00