generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-20 16:03:34 +02:00
Code Issues Projects Releases Wiki Activity
876 Commits 4 Branches 55 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
Christopher Dunn
126bdc2b05 Reject extra chars if strictRoot 
resolves #511
 2016-08-21 20:32:16 -05:00
Christopher Dunn
094a7d8564 Fix locale for decimal points 
resolves #514
 2016-08-21 20:13:58 -05:00
Christopher Dunn
ea4af18317 Fix int->char conv warn 
resolves #473
 2016-05-15 23:13:56 -05:00
Christopher Dunn
98e981dff9 Use macro for override 
b/c MS VS2010 is supposed to be C++11 but does not fulfull
the entire standard.

Resolves #410.
Re: #430.
 2016-03-21 21:00:24 -05:00
dawesc
ae564653c4 -DJSONCPP_USE_SECURE_MEMORY=1 for cmake 
Add allocator.h to amalgamated header
Test JSONCPP_USE_SECURE_MEMORY in Travis
 2016-03-19 19:21:15 -05:00
Christopher Dawes
75570d7068 Fixing up for #define instead of typedef in secure allocators 2016-03-14 19:15:17 -05:00
Christopher Dunn
b84e0c159d JSONCPP_ISTREAM 2016-03-06 11:56:39 -06:00
Christopher Dunn
1e990640a9 JSONCPP_ISTRINGSTREAM 2016-03-06 11:56:39 -06:00
Christopher Dunn
38bb491400 JSONCPP_OSTRINGSTREAM 2016-03-06 11:56:38 -06:00
Techwolf
7e46bf76e8 std::snprintf fix for Cygwin 2016-02-10 17:09:32 -08:00
Christopher Dunn
2c872ec997 Merge pull request #406 from magnific0/master 
std::snprintf not part of std for MinGW32 using c++11
 2016-02-06 10:21:45 -06:00
Christopher Dunn
d4513fcf45 Fix conversion warnings/errors 
See #411.
  http://paste.debian.net/378673/
 2016-02-06 09:25:20 -06:00
Jacco
2646ac5fa5 std::snprintf fix for MinGW32 c++11 2016-01-25 11:38:49 +01:00
Evince
6b10ce8c0d json_reader throwRuntimeError return error details instead of hard-coded message 
Signed-off-by: Evince <baneyue@gmail.com>
 2015-10-28 00:22:46 +08:00
Christopher Dunn
beae99924f Merge pull request #373 from antonindrawan/QNX_support 
Compiles jsoncpp with QNX 6.6
 2015-10-04 14:54:09 -05:00
drgler
b96d90efbd Remove defaulted default constructor 2015-10-03 19:40:23 +02:00
Anton Indrawan
e375b8c89e Compiles jsoncpp with QNX 6.6 2015-10-03 11:48:19 +02:00
drgler
7e4875a239 __cplusplus value should not be used to decide for std::unique_ptr #350: 
In addition to the C++ language version define __cplusplus also check _CPPLIB_VER for better Dinkumware support.
 2015-09-27 14:03:35 +02:00
Christopher Dunn
979cbec237 Fully init OurReader 
See #363, similar to #364.
 2015-09-23 09:44:58 -05:00
Gaurav
83ea25e5e2 Make OurFeatures ctor as default. 
Please review suggested changes.
 2015-09-23 09:42:26 +05:30
Gaurav
e3b35992f8 Add default value of stackLimit couple of places 
stackLimit default value is missing at two places.Adding them.
 2015-09-21 18:05:15 +05:30
Gaurav
aadd0b1b63 C++11: override keyword 
Source : http://en.cppreference.com/w/cpp/language/override
 2015-09-05 12:03:38 -05:00
drgler
68509e6161 Fix number reading in the presence of Infinity: Only check for infinity if we have a leading sign character. 2015-09-05 14:49:33 +02:00
drgler
2084563efb Floating-point NaN or Infinity values should be allowed as a feature #209 
Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent macro snprintf definition for writers and readers, provide new unit tests for #209
 2015-09-03 22:19:22 +02:00
Michael Shields
7f06e9dc28 Fix cases where the most negative signed integer was negated, causing 
undefined behavior.
 2015-07-27 16:35:19 -07:00
Christopher Dunn
6416350438 fix ,/. problem in reader 
fixes #293
 2015-06-18 22:45:36 -05:00
Christopher Dunn
2250b3c29d use Json::RuntimeError 2015-03-08 12:44:55 -05:00
Christopher Dunn
717b08695e clarify errors 
* use macros for logic errors, not input errors
* throw on parsing failure in `operator>>()`, not assert
* throw on malloc, not assert
 2015-03-08 12:06:22 -05:00
Christopher Dunn
62ad140d18 rejectDupKeys 2015-03-06 12:39:05 -06:00
Christopher Dunn
527332d5d5 add rejectDupKeys feature - not yet impld 2015-03-06 12:38:58 -06:00
Christopher Dunn
c312dd5ef7 Builder::operator[] plus tests 2015-03-05 09:18:01 -06:00
Christopher Dunn
19c49a459d fix Builders::validate() 
(cherry picked from commit 626cfcdbb83bdc93243d7b64144e88f08c510085)
 2015-03-04 21:14:53 -06:00
Christopher Dunn
2d653bd15d fix security hole for string-key-lengths > 2^30 2015-03-03 00:14:54 -06:00
Christopher Dunn
0c66e698fb allowSingleQuotes 
issue #182
 2015-02-24 15:49:45 -06:00
Christopher Dunn
7b3683ccd1 apply fix to old Reader 2015-02-19 11:37:17 -06:00
Christopher Dunn
58499031a4 fix all cases from issue -- all pass! 2015-02-19 11:35:28 -06:00
Christopher Dunn
c58e93b014 fix failing object case 2015-02-19 11:34:35 -06:00
Christopher Dunn
f4be815c86 failIfExtra 
1. failing regression tests, from #164 and #107
2. implemented; tests pass
3. allow trailing comments
 2015-02-13 09:39:08 -06:00
Christopher Dunn
3ebba5cea8 stop calling validate() in newReader/Writer() 
By not calling validate(), we can add
non-invasive features which will be simply ignored when user-code
is compiled against an old version. That way, we can often
avoid a minor version-bump.

The user can call validate() himself if he prefers that behavior.
 2015-02-11 11:15:32 -06:00
Christopher Dunn
56df206847 limit stackDepth for old (deprecated) Json::Reader too 
This is an improper solution. If multiple Readers exist,
then the effect stackLimit is reduced because of side-effects.
But our options are limited. We need to address the security
hole without breaking binary-compatibility.

However, this is not likely to cause any practical problems because:

* Anyone using `operator>>(istream, Json::Value)` will be using the
new code already
* Multiple Readers are uncommon.
* The stackLimit is quite high.
* Deeply nested JSON probably would have hit the system limits anyway.
 2015-02-11 10:20:53 -06:00
Christopher Dunn
4dca80da49 limit stackDepth 2015-02-11 10:20:47 -06:00
Christopher Dunn
249ad9f47f stackLimit 2015-02-11 10:01:58 -06:00
Christopher Dunn
99b8e856f6 stackLimit_ 2015-02-11 10:01:58 -06:00
Christopher Dunn
2474989f24 Old -> Our 2015-02-11 09:48:24 -06:00
Christopher Dunn
052050df07 copy Features to OldFeatures 2015-02-10 17:01:08 -06:00
Christopher Dunn
435d2a2f8d passes 2015-02-10 17:01:08 -06:00
Christopher Dunn
6123bd1505 copy Reader impl to OldReader 2015-02-10 17:01:08 -06:00
Christopher Dunn
7477bcfa3a renames for OldReader 2015-02-10 17:01:08 -06:00
Christopher Dunn
5e3e68af2e OldReader copied from Reader 2015-02-10 17:01:08 -06:00
Christopher Dunn
b56381a636 <stdexcept> 2015-02-09 18:29:11 -06:00