summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Fix arbitrary heap exposure problemFlorian Frank2017-04-102-7/+6
* Remove unused macroFlorian Frank2017-04-101-3/+0
* Revert "Merge decimal_class patch by Michael Jaschob"Florian Frank2017-01-123-114/+79
* Support some older internal Ruby API (<2.0)Florian Frank2017-01-122-1142/+1300
* Merge decimal_class patch by Michael JaschobFlorian Frank2016-09-233-1304/+1181
* Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-07-261-0/+1
|\
| * Suppress a warningNobuyoshi Nakada2016-07-081-0/+1
* | Fix issue #296 when parsing frozen stringsFlorian Frank2016-07-262-8/+14
|/
* Stores current nesting on stackFlorian Frank2016-07-013-87/+76
* RB_GC_GUARD to protect from premature GCPete Johns2016-07-011-0/+1
* Fix some merge problemsFlorian Frank2016-06-212-124/+0
* Optional hash in rb_scan_argsNobuyoshi Nakada2016-06-211-0/+32
* Exception encodingNobuyoshi Nakada2016-06-212-2/+34
* Use rb_encodingNobuyoshi Nakada2016-06-212-89/+68
* Remove unnecessary conversionNobuyoshi Nakada2016-06-212-2/+32
* Use enumNobuyoshi Nakada2016-06-211-8/+57
* regenerate parserAaron Patterson2016-06-211-0/+2
* resize strings after parsingAaron Patterson2016-06-211-0/+2
* Merge more changes from ruby coreFlorian Frank2016-06-213-117/+150
* Adapt to ruby integer unificationFlorian Frank2016-06-212-3/+43
* Force ASCII 8bit to be UTF-8 and hope for the bestFlorian Frank2016-06-032-85/+93
* Remove quirks modeFlorian Frank2016-06-022-34/+1
* Merge branch 'v1.8'Florian Frank2016-02-251-1/+1
|\
| * Avoid system stack errorFlorian Frank2016-02-251-1/+1
* | Disallow usage of symbolize_names and create_additionsFlorian Frank2015-06-152-12/+24
* | Ext parser is green now as wellFlorian Frank2015-06-154-435/+228
* | Remove byte sniffing from Ext::ParserFlorian Frank2015-06-132-127/+57
* | Remove generate restriction for […]/{…}Florian Frank2015-06-131-18/+0
|/
* generator.c: allocate structs with wrappernobu2015-05-282-11/+5
* parser.rl: allocate structs with wrappernobu2015-05-283-23/+10
* use ZALLOC if it can be used, and defined ZALLOC macro.SHIBATA Hiroshi2015-02-125-39/+54
* sync trunk again: fixed regression of r49027SHIBATA Hiroshi2015-02-122-9/+9
* Use space_before as documented in the generatorMichael Mac-Vicar2015-01-091-0/+1
* Fall back to Data_* wrappers on ancient rubiesFlorian Frank2015-01-025-1/+19
* Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2Florian Frank2015-01-029-45/+102
|\
| * RUBY_TYPED_FREE_IMMEDIATELY isn't always availableZachary Scott2014-12-273-33/+39
| * Use ALLOC and MEMZERO instead of ZALLOCZachary Scott2014-12-261-1/+2
| * Revert part of "Sync with trunk"Zachary Scott2014-12-263-49/+0
| * Add extconf from trunkZachary Scott2014-12-251-0/+3
| * This file shouldn't be committedZachary Scott2014-12-251-280/+0
| * bundle exec rakeZachary Scott2014-12-251-0/+280
| * Sync with trunkZachary Scott2014-12-2511-94/+190
| * - Pass over generator.c for grammar fixes.Vipul A M2014-07-034-13/+13
| * Change documentation to reflect new default valueFlorian Frank2014-04-011-1/+1
* | Fix documentation wordingFlorian Frank2014-07-034-14/+14
|/
* Suppress warning: -Wchar-subscriptsNARUSE, Yui2013-05-081-2/+2
* Validate UTF-8 strings.NARUSE, Yui2013-02-221-1/+12
* Try to convert first with to_hash, then to_hFlorian Frank2013-02-211-4/+1
* Security fix create_additons/JSON::GenericObjectv1.7.7Florian Frank2013-02-112-2/+2
* Remove useless assert, fbuffer_alloc cares alreadyFlorian Frank2013-02-042-7/+2