diff --git a/CMakeLists.txt b/CMakeLists.txt
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_Q01ha2VMaXN0cy50eHQ=..1452f85c46863fa0d6e15678fe0a19f14657569c_Q01ha2VMaXN0cy50eHQ= 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,7 +238,7 @@
option(ENABLE_LOCALES "Enable the use of locales" ON)
if(ENABLE_LOCALES)
add_definitions(-DENABLE_LOCALES)
-endif()
+endif()
add_subdirectory(tests)
add_subdirectory(fuzzing)
diff --git a/LICENSE b/LICENSE
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_TElDRU5TRQ==..1452f85c46863fa0d6e15678fe0a19f14657569c_TElDRU5TRQ== 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,9 @@
- Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
@@ -20,1 +9,12 @@
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/cJSON.c b/cJSON.c
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_Y0pTT04uYw==..1452f85c46863fa0d6e15678fe0a19f14657569c_Y0pTT04uYw== 100644
--- a/cJSON.c
+++ b/cJSON.c
@@ -1062,7 +1062,7 @@
{
*return_parse_end = (const char*)local_error.json + local_error.position;
}
-
+
global_error = local_error;
}
diff --git a/fuzzing/inputs/test11 b/fuzzing/inputs/test11
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDEx..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDEx 100644
--- a/fuzzing/inputs/test11
+++ b/fuzzing/inputs/test11
@@ -1,8 +1,8 @@
bf{
-"name": "Jack (\"Bee\") Nimble",
-"format": {"type": "rect",
-"width": 1920,
-"height": 1080,
+"name": "Jack (\"Bee\") Nimble",
+"format": {"type": "rect",
+"width": 1920,
+"height": 1080,
"interlace": false,"frame rate": 24
}
}
diff --git a/fuzzing/inputs/test3 b/fuzzing/inputs/test3
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDM=..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDM= 100644
--- a/fuzzing/inputs/test3
+++ b/fuzzing/inputs/test3
@@ -6,7 +6,7 @@
"width": 500,
"height": 500
},
- "image": {
+ "image": {
"src": "Images/Sun.png",
"name": "sun1",
"hOffset": 250,
@@ -23,4 +23,4 @@
"alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
}
-}}
+}}
diff --git a/fuzzing/inputs/test3.bu b/fuzzing/inputs/test3.bu
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDMuYnU=..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDMuYnU= 100644
--- a/fuzzing/inputs/test3.bu
+++ b/fuzzing/inputs/test3.bu
@@ -6,7 +6,7 @@
"width": 500,
"height": 500
},
- "image": {
+ "image": {
"src": "Images/Sun.png",
"name": "sun1",
"hOffset": 250,
@@ -23,4 +23,4 @@
"alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
}
-}}
+}}
diff --git a/fuzzing/inputs/test3.uf b/fuzzing/inputs/test3.uf
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDMudWY=..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDMudWY= 100644
--- a/fuzzing/inputs/test3.uf
+++ b/fuzzing/inputs/test3.uf
@@ -6,7 +6,7 @@
"width": 500,
"height": 500
},
- "image": {
+ "image": {
"src": "Images/Sun.png",
"name": "sun1",
"hOffset": 250,
@@ -23,4 +23,4 @@
"alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
}
-}}
+}}
diff --git a/fuzzing/inputs/test3.uu b/fuzzing/inputs/test3.uu
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDMudXU=..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDMudXU= 100644
--- a/fuzzing/inputs/test3.uu
+++ b/fuzzing/inputs/test3.uu
@@ -6,7 +6,7 @@
"width": 500,
"height": 500
},
- "image": {
+ "image": {
"src": "Images/Sun.png",
"name": "sun1",
"hOffset": 250,
@@ -23,4 +23,4 @@
"alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
}
-}}
+}}
diff --git a/fuzzing/inputs/test4 b/fuzzing/inputs/test4
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_ZnV6emluZy9pbnB1dHMvdGVzdDQ=..1452f85c46863fa0d6e15678fe0a19f14657569c_ZnV6emluZy9pbnB1dHMvdGVzdDQ= 100644
--- a/fuzzing/inputs/test4
+++ b/fuzzing/inputs/test4
@@ -1,5 +1,5 @@
bf{"web-app": {
- "servlet": [
+ "servlet": [
{
"servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet",
@@ -55,7 +55,7 @@
{
"servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"},
-
+
{
"servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"},
@@ -82,7 +82,7 @@
"cofaxAdmin": "/admin/*",
"fileServlet": "/static/*",
"cofaxTools": "/tools/*"},
-
+
"taglib": {
"taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
diff --git a/tests/inputs/test11 b/tests/inputs/test11
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_dGVzdHMvaW5wdXRzL3Rlc3QxMQ==..1452f85c46863fa0d6e15678fe0a19f14657569c_dGVzdHMvaW5wdXRzL3Rlc3QxMQ== 100644
--- a/tests/inputs/test11
+++ b/tests/inputs/test11
@@ -1,8 +1,8 @@
{
-"name": "Jack (\"Bee\") Nimble",
-"format": {"type": "rect",
-"width": 1920,
-"height": 1080,
+"name": "Jack (\"Bee\") Nimble",
+"format": {"type": "rect",
+"width": 1920,
+"height": 1080,
"interlace": false,"frame rate": 24
}
}
diff --git a/tests/inputs/test3 b/tests/inputs/test3
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_dGVzdHMvaW5wdXRzL3Rlc3Qz..1452f85c46863fa0d6e15678fe0a19f14657569c_dGVzdHMvaW5wdXRzL3Rlc3Qz 100644
--- a/tests/inputs/test3
+++ b/tests/inputs/test3
@@ -6,7 +6,7 @@
"width": 500,
"height": 500
},
- "image": {
+ "image": {
"src": "Images/Sun.png",
"name": "sun1",
"hOffset": 250,
@@ -23,4 +23,4 @@
"alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
}
-}}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/tests/inputs/test4 b/tests/inputs/test4
index eae13e6d0495cdf69b596f54fc3fe985fda68e72_dGVzdHMvaW5wdXRzL3Rlc3Q0..1452f85c46863fa0d6e15678fe0a19f14657569c_dGVzdHMvaW5wdXRzL3Rlc3Q0 100644
--- a/tests/inputs/test4
+++ b/tests/inputs/test4
@@ -1,5 +1,5 @@
{"web-app": {
- "servlet": [
+ "servlet": [
{
"servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet",
@@ -55,7 +55,7 @@
{
"servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"},
-
+
{
"servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"},
@@ -82,7 +82,7 @@
"cofaxAdmin": "/admin/*",
"fileServlet": "/static/*",
"cofaxTools": "/tools/*"},
-
+
"taglib": {
"taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
\ No newline at end of file