Petri Lehtinen
4e8c4bfbd2
Merge branch '2.5'
2013-12-13 09:27:42 +02:00
Petri Lehtinen
316492e4d0
Merge
2013-12-13 09:26:58 +02:00
Petri Lehtinen
3347679d8f
Merge branch '2.5'
2013-12-13 09:22:50 +02:00
Petri Lehtinen
b951baec0d
Include CMake specific files in release tarballs
...
Fixes #147 .
2013-12-13 09:22:36 +02:00
Petri Lehtinen
05f7d30e5a
Add json_boolean_value as alias for json_is_true
...
Fixes #146 .
2013-12-04 09:14:19 +02:00
Petri Lehtinen
34d8b92dce
Merge branch '2.5'
2013-11-14 08:49:24 +02:00
Petri Lehtinen
67a7bc7376
doc: Set all memory to zero in secure_free
2013-11-14 08:49:16 +02:00
Petri Lehtinen
30a4c88843
Fix an off-by-one error
2013-10-15 08:49:40 +03:00
Petri Lehtinen
08be94e8e6
Don't call strlen twice
...
Oops.
2013-10-15 08:46:17 +03:00
Petri Lehtinen
d544852ff6
Avoid integer overflows with very long strings
2013-10-15 08:44:04 +03:00
Petri Lehtinen
8dc3233f3b
Merge pull request #143 from chipdude/master
...
paper bag bug: json_string_set* functions should set the length too
2013-10-03 22:36:34 -07:00
Chip Salzenberg
c7d479c740
in simple string tests, always check lengths too
2013-10-03 19:07:50 -07:00
Chip Salzenberg
a76dc45512
paper bag bug: json_string_set* functions should set the length too
2013-10-03 19:07:20 -07:00
Petri Lehtinen
9bb5a266dd
Merge pull request #142 from chipdude/master
...
fix type mismatch anywhere int != int32 (Vorne)
2013-09-30 22:41:25 -07:00
Chip Salzenberg
6ebd0bc7a6
fix type mismatch anywhere int != int32 (Vorne)
2013-09-30 16:56:01 -07:00
Petri Lehtinen
f8d8d524cf
Document JSON_ALLOW_NUL and clarify NUL byte handling
2013-09-30 10:55:34 +03:00
Petri Lehtinen
1bfc33362e
Add JSON_ALLOW_NUL decoding flag for enabling NUL byte support
2013-09-30 10:45:02 +03:00
Petri Lehtinen
5744468c99
Clarify json_string_length doc
2013-09-30 10:45:02 +03:00
Petri Lehtinen
4d5aead31c
Fix NUL byte check for object keys
2013-09-30 10:45:02 +03:00
Petri Lehtinen
78a80b8899
load.c: Change an error message
2013-09-30 09:24:36 +03:00
Petri Lehtinen
b961e8101e
Add Chip's changes to release notes
2013-09-30 08:56:39 +03:00
Petri Lehtinen
7876125a22
Document s% and s# for json_pack, s% for json_unpack
2013-09-30 08:47:05 +03:00
Petri Lehtinen
e2dcf94598
Merge pull request #141 from chipdude/nuls
...
add new public functions to jansson.def
2013-09-29 22:31:15 -07:00
Chip Salzenberg
6c1ce27095
add new public functions to jansson.def
2013-09-29 16:57:23 -07:00
Petri Lehtinen
46e27ae6d5
Merge pull request #140 from chipdude/nuls
...
Support "\u0000" in strings
2013-09-29 11:57:57 -07:00
Chip Salzenberg
0be5c959da
document new null-friendly functions
2013-09-27 19:10:32 -07:00
Chip Salzenberg
face43929d
expect "export" in test configs
2013-09-27 17:32:25 -07:00
Chip Salzenberg
dcaa90d21e
dump \u sequences as upper case for readability (just like error messages)
2013-09-27 17:32:25 -07:00
Chip Salzenberg
9c259c07aa
Support \u0000 - add size_t string lengths to API, load and dump \u000, etc.
...
Also:
Steal strings during parsing for half the mallocs!
Change all input-caused assertions to errors. No crashes please, we're programmers.
2013-09-27 17:32:06 -07:00
Petri Lehtinen
e4d6a9f6f4
Add versionadded to the new json_pack() format specifiers
2013-09-23 09:34:28 +03:00
Petri Lehtinen
641002da37
jansson 2.5
2013-09-19 21:26:46 +03:00
Petri Lehtinen
9f9c9fe410
doc: Fix index type for json_array_foreach()
2013-09-19 21:26:46 +03:00
Petri Lehtinen
e39112b29c
Merge branch '2.4'
2013-09-19 20:47:33 +03:00
Petri Lehtinen
bf2584703a
Mention success first in json_load_callback_t docs
2013-09-19 20:47:17 +03:00
Phillip Howell
db8ca3645f
Clarified json_load_callback_t return value docs
2013-09-19 20:47:02 +03:00
Petri Lehtinen
0490907fb3
Merge branch '2.4'
2013-09-19 20:46:07 +03:00
Petri Lehtinen
c2e8fdde9d
Mention success first in json_load_callback_t docs
2013-09-19 20:45:51 +03:00
Petri Lehtinen
24c67966aa
Mention success first in json_load_callback_t docs
2013-09-16 08:49:38 +03:00
Phillip Howell
0747d3943f
Clarified json_load_callback_t return value docs
2013-09-16 08:49:38 +03:00
Petri Lehtinen
5f9ef108d0
Merge pull request #134 from lano1106/master
...
Replace strcpy with memcpy
2013-08-27 22:37:44 -07:00
Olivier Langlois
21599b95f8
Replace strcpy with memcpy
...
Since len is known, the copy function does not need to check byte by byte
the end of the string.
Signed-off-by: Olivier Langlois <olivier@olivierlanglois.net>
2013-08-27 22:47:18 -04:00
Petri Lehtinen
3196ad48ed
pack: Add format specifiers s#, + and +#
2013-08-14 21:54:11 +03:00
Petri Lehtinen
49ad5328c7
doc: Add an example for circumventing problems with Windows heaps
2013-08-06 08:12:20 +03:00
Petri Lehtinen
71676acd0b
Fix memory leaks and warnings in github_commits.c
2013-07-27 21:23:34 +03:00
Petri Lehtinen
2489ea90b1
Update copyrights for 2013
2013-07-23 13:20:06 +03:00
Petri Lehtinen
11d45b0090
Fix integer overflow in jsonp_strdup()
...
Fixes #129 .
2013-07-21 13:00:32 +03:00
Petri Lehtinen
8490e377c0
Make the argument of json_deep_copy() const
...
Fixes #126 .
2013-07-08 12:36:56 +03:00
Petri Lehtinen
ef666519f7
Merge pull request #128 from JoakimSoderberg/lex_unget_unsave_fix
...
BUGFIX: Compilation error with -DNDEBUG defined.
2013-07-01 21:41:55 -07:00
Joakim Soderberg
6fe231757e
BUGFIX: Compilation error with -DNDEBUG defined.
...
When building a "MinSizeRel" with CMake I get a compilation error in lex_unget_unsave. This is because assertions are turned off using -DNDEBUG:
```
/usr/bin/gcc -DHAVE_CONFIG_H -fPIC -Os -DNDEBUG -Ijansson/build/include -Ijansson/build/private_include -Wall -Wextra -Wdeclaration-after-statement -Werror -o CMakeFiles/jansson.dir/src/load.c.o -c jansson/src/load.c
jansson/src/load.c: In function âx_unget_unsaveâjansson/src/load.c:256:14: error: variable â set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
```
This will then remove the insert, which makes the "d" variable unused, which is treated as an error since we have -Wall set. We can't simply get rid of the variable either and put the strbuffer_pop call in the assert call, since it's a macro and would remove the call entirely. So I simply added a check for NDEBUG to fix it.
2013-06-26 09:50:46 +00:00
Petri Lehtinen
84b5bfe173
Merge pull request #127 from cryptobiote/master
...
Adding option for MSVC for those who are linking statically.
2013-06-25 11:30:39 -07:00
