Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								55be721615
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/fuzzer
							
							
							
							
							
						 | 
						
							2016-12-28 12:11:51 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								acb7e0558d
								
							
						 | 
						
							
							
								
								🚑 fixed bugs detected by AFL-Fuzz
							
							
							
							
							
						 | 
						
							2016-12-28 12:09:15 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3b036348b
								
							
						 | 
						
							
							
								
								🚧 added targets for parallel AFL fuzzing
							
							
							
							
							
						 | 
						
							2016-12-25 16:36:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								1399abc583
								
							
						 | 
						
							
							
								
								🚧 added MessagePack fuzz target
							
							
							
							
							
						 | 
						
							2016-12-25 16:18:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4cc62e653
								
							
						 | 
						
							
							
								
								🐛 fixed Makefile to work with proper CBOR files
							
							
							
							
							
						 | 
						
							2016-12-25 16:07:10 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								6de9d4035a
								
							
						 | 
						
							
							
								
								🐛 fixed AFL driver to also read binary data
							
							
							
							
							
						 | 
						
							2016-12-25 16:06:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								dbdcb3fec8
								
							
						 | 
						
							
							
								
								🐛 fixed bug in CBOR/MessagePack deserialization
							
							
							
							
							
						 | 
						
							2016-12-25 16:06:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e129fbfb7
								
							
						 | 
						
							
							
								
								📝 some small documentation fixes
							
							
							
							
							
						 | 
						
							2016-12-25 14:39:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f87f4c06f9
								
							
						 | 
						
							
							
								
								🚧 cleanup
							
							
							
							
							
						 | 
						
							2016-12-22 12:10:52 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								33be4e7f1f
								
							
						 | 
						
							
							
								
								🚧 cleanup
							
							
							
							
							
						 | 
						
							2016-12-22 12:08:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a084e90f39
								
							
						 | 
						
							
							
								
								🔨 split AFL test in driver and test file
							
							
							
							
							
						 | 
						
							2016-12-22 11:09:26 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								048330b14b
								
							
						 | 
						
							
							
								
								⬆️ Catch v1.5.9
							
							
							
							
							
						 | 
						
							2016-12-22 09:37:15 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								22a6b956e8
								
							
						 | 
						
							
							
								
								📄 added license for Catch
							
							
							
							
							
						 | 
						
							2016-12-22 09:36:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad241a2260
								
							
						 | 
						
							
							
								
								🔨 moved third-party code into separate folder
							
							
							
							
							
						 | 
						
							2016-12-22 09:35:53 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e8791912f
								
							
						 | 
						
							
							
								
								🚧 added fuzzer from OSS-Fuzz
							
							
							
							
							
						 | 
						
							2016-12-22 09:09:40 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								69ed19e483
								
							
						 | 
						
							
							
								
								➕ added libFuzzer
							
							
							
							
							
						 | 
						
							2016-12-22 09:08:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								7107072f71
								
							
						 | 
						
							
							
								
								👷 clang for fedora
							
							
							
							
							
						 | 
						
							2016-12-21 10:33:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cf0f299ad
								
							
						 | 
						
							
							
								
								👷 using clang where GCC is too old
							
							
							
							
							
						 | 
						
							2016-12-21 10:13:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								937cca762f
								
							
						 | 
						
							
							
								
								👷 forgot to install make
							
							
							
							
							
						 | 
						
							2016-12-21 09:54:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								91e45a8dd0
								
							
						 | 
						
							
							
								
								👷 the cmake of trusty is too old
							
							
							
							
							
						 | 
						
							2016-12-21 09:47:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f78671de8e
								
							
						 | 
						
							
							
								
								👷 Fedora has no package "build-essential"
							
							
							
							
							
						 | 
						
							2016-12-21 09:33:16 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e5208d5cd
								
							
						 | 
						
							
							
								
								👷 there is no cmake in the osx image
							
							
							
							
							
						 | 
						
							2016-12-21 09:19:53 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6fbd305b0
								
							
						 | 
						
							
							
								
								👷 trying more doozer workers
							
							
							
							
							
						 | 
						
							2016-12-21 09:17:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								38597ac628
								
							
						 | 
						
							
							
								
								👷 added more builders
							
							
							
							
							
						 | 
						
							2016-12-20 23:04:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andreas Smas
								
							 
						 | 
						
							
							
							
							
								
							
							
								57b32d9773
								
							
						 | 
						
							
							
								
								Add Doozer build badge
							
							
							
							
							
						 | 
						
							2016-12-20 21:38:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								73b28e8f92
								
							
						 | 
						
							
							
								
								👷 fixing build command
							
							
							
							
							
						 | 
						
							2016-12-20 19:16:52 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								1178a8152a
								
							
						 | 
						
							
							
								
								👷 using cmake with Doozer
							
							
							
							
							
						 | 
						
							2016-12-20 19:13:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								0fffbb8488
								
							
						 | 
						
							
							
								
								👷 trying Doozer
							
							
							
							
							
						 | 
						
							2016-12-20 19:06:15 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								9952a3c456
								
							
						 | 
						
							
							
								
								👷 trying to fix coverity task
							
							
							
							
							
						 | 
						
							2016-12-18 18:17:26 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e55af23fc
								
							
						 | 
						
							
							
								
								🔀 Merge branch 'release/2.0.9' into develop
							
							
							
							
							
						 | 
						
							2016-12-16 21:35:28 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								57afd293aa
								
							
						 | 
						
							
							
								
								🔖 updated documentation
							
							
							
							
							
						 | 
						
							2016-12-16 21:34:37 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a507b9b46a
								
							
						 | 
						
							
							
								
								🔖 updated documentation
							
							
							
							
							
						 | 
						
							2016-12-16 21:25:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								36dc786106
								
							
						 | 
						
							
							
								
								🔖 updated Changelog
							
							
							
							
							
						 | 
						
							2016-12-16 21:09:14 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								706be50596
								
							
						 | 
						
							
							
								
								📝 updated number of tests
							
							
							
							
							
						 | 
						
							2016-12-16 20:54:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								303e873ae8
								
							
						 | 
						
							
							
								
								🔖 bumped version to 2.0.9
							
							
							
							
							
						 | 
						
							2016-12-16 20:45:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6f7fed99a
								
							
						 | 
						
							
							
								
								🚨 removed some warnings
							
							
							
							
							
						 | 
						
							2016-12-16 18:57:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f24e4f680e
								
							
						 | 
						
							
							
								
								🎨 cleanup after PR #395
							
							
							
							
							
						 | 
						
							2016-12-14 22:30:09 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe00b368ae
								
							
						 | 
						
							
							
								
								🔀 merge pull request #395 from Bosswestfalen/develop
							
							
							
							
							
							
							
							Replace class iterator and const_iterator by using a single template class to reduce code. 
							
						 | 
						
							2016-12-14 21:56:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f94c30bad
								
							
						 | 
						
							
							
								
								✅ added a regression test for #380 / #390
							
							
							
							
							
						 | 
						
							2016-12-13 21:46:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e2fb1a533
								
							
						 | 
						
							
							
								
								Merge pull request #390 from qwename/integer-overflow
							
							
							
							
							
							
							
							🔀 fix issue #380: Signed integer overflow check 
							
						 | 
						
							2016-12-13 21:26:53 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								dfafd2c259
								
							
						 | 
						
							
							
								
								👷 can't get clang sanitizer to work #394
							
							
							
							
							
							
							
							See https://travis-ci.org/nlohmann/json/jobs/183684093 for a failing
build. 
							
						 | 
						
							2016-12-13 21:23:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bosswestfalen
								
							 
						 | 
						
							
							
							
							
								
							
							
								92e28c3153
								
							
						 | 
						
							
							
								
								added missing changes in json.hpp.re2c
							
							
							
							
							
						 | 
						
							2016-12-13 20:30:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3fac19692
								
							
						 | 
						
							
							
								
								👷 another try for sanitizers #394
							
							
							
							
							
						 | 
						
							2016-12-13 19:41:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f089cab2b
								
							
						 | 
						
							
							
								
								👷 moved instructed build to "before_script" #394
							
							
							
							
							
						 | 
						
							2016-12-13 18:24:16 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b5411db57
								
							
						 | 
						
							
							
								
								👷 clang 3.9.0 is not working #394
							
							
							
							
							
						 | 
						
							2016-12-13 17:55:41 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5d4a9c4eb
								
							
						 | 
						
							
							
								
								👷 added Clang 3.9.0 and sanitizer build #394
							
							
							
							
							
						 | 
						
							2016-12-13 17:51:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Yixin Zhang
								
							 
						 | 
						
							
							
							
							
								
							
							
								703d4baf8b
								
							
						 | 
						
							
							
								
								Fixed conversion warnings
							
							
							
							
							
							
							
							Use static_cast on digit. 
							
						 | 
						
							2016-12-12 21:12:08 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Yixin Zhang
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd6422f583
								
							
						 | 
						
							
							
								
								Ran make pretty
							
							
							
							
							
						 | 
						
							2016-12-12 21:12:08 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Yixin Zhang
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e981115c9
								
							
						 | 
						
							
							
								
								Fix issue #380: Signed integer overflow check
							
							
							
							
							
							
							
							Instead of checking something like `x * y + z > max` where `x * y` can
overflow, check for `x > (max - z) / y` instead. 
							
						 | 
						
							2016-12-12 21:12:08 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								79fa8b2f41
								
							
						 | 
						
							
							
								
								🚑 fix to address #389
							
							
							
							
							
						 | 
						
							2016-12-12 23:19:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |