From 27a3f52b435604d3d4d99d6310d5500465dc4be9 Mon Sep 17 00:00:00 2001 From: Lee George Thomas Date: Wed, 24 Feb 2021 23:50:26 +0000 Subject: [PATCH 1/4] Fix MISRA 9.1 violation --- source/core_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core_json.c b/source/core_json.c index ac2c55cd..d6ad4e8a 100644 --- a/source/core_json.c +++ b/source/core_json.c @@ -1620,7 +1620,7 @@ JSONStatus_t JSON_SearchConst( const char * buf, JSONTypes_t * outType ) { JSONStatus_t ret; - size_t value; + size_t value = 0U; if( ( buf == NULL ) || ( query == NULL ) || ( outValue == NULL ) || ( outValueLength == NULL ) ) From e47c20cb5d438a06fd976ceb8b9ab13349777415 Mon Sep 17 00:00:00 2001 From: Archit Aggarwal Date: Thu, 25 Feb 2021 01:28:40 +0000 Subject: [PATCH 2/4] Update CHANGELOG for upcoming release --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d43c9cd1..ee34dbd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log for coreJSON Library +## v3.0.1 (December 2020) + - [#86]([#84](https://github.com/FreeRTOS/coreJSON/pull/86) Fix MISRA 9.1 volation. + - [#84](https://github.com/FreeRTOS/coreJSON/pull/84), [#82](https://github.com/FreeRTOS/coreJSON/pull/82) and [#80](https://github.com/FreeRTOS/coreJSON/pull/80) Documentation updates and fixes. + ## v3.0.0 (December 2020) - [#74](https://github.com/FreeRTOS/coreJSON/pull/74) Add `JSON_Iterate` function to iterate over items in a JSON collection. - [#74](https://github.com/FreeRTOS/coreJSON/pull/74) Add `JSONInvalid` enum with the value 0 to `JSONTypes_t`. This change is not backwards compatible. From 82c204f85a0f46a50e64f2192db38cd1d0641680 Mon Sep 17 00:00:00 2001 From: Archit Aggarwal Date: Thu, 25 Feb 2021 01:31:41 +0000 Subject: [PATCH 3/4] Update source file versioning to v3.0.1 --- CHANGELOG.md | 4 ++-- docs/doxygen/config.doxyfile | 2 +- manifest.yml | 2 +- source/core_json.c | 2 +- source/include/core_json.h | 2 +- test/cbmc/include/core_json_annex.h | 2 +- test/cbmc/include/skipGeneric.h | 2 +- test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c | 2 +- test/cbmc/proofs/JSON_Search/JSON_Search_harness.c | 2 +- test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c | 2 +- test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c | 2 +- test/cbmc/proofs/skipCollection/skipCollection_harness.c | 2 +- test/cbmc/proofs/skipEscape/skipEscape_harness.c | 2 +- test/cbmc/proofs/skipNumber/skipNumber_harness.c | 2 +- test/cbmc/proofs/skipSpace/skipSpace_harness.c | 2 +- .../cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c | 2 +- test/cbmc/proofs/skipString/skipString_harness.c | 2 +- test/cbmc/proofs/skipUTF8/skipUTF8_harness.c | 2 +- test/cbmc/stubs/skipAnyLiteral.c | 2 +- test/cbmc/stubs/skipAnyScalar.c | 2 +- test/cbmc/stubs/skipCollection.c | 2 +- test/cbmc/stubs/skipEscape.c | 2 +- test/cbmc/stubs/skipGeneric.c | 2 +- test/cbmc/stubs/skipNumber.c | 2 +- test/cbmc/stubs/skipSpace.c | 2 +- test/cbmc/stubs/skipSpaceAndComma.c | 2 +- test/cbmc/stubs/skipString.c | 2 +- test/cbmc/stubs/skipUTF8.c | 2 +- test/unit-test/CMock | 1 + test/unit-test/core_json_utest.c | 2 +- 30 files changed, 31 insertions(+), 30 deletions(-) create mode 160000 test/unit-test/CMock diff --git a/CHANGELOG.md b/CHANGELOG.md index ee34dbd2..7045e6a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log for coreJSON Library -## v3.0.1 (December 2020) - - [#86]([#84](https://github.com/FreeRTOS/coreJSON/pull/86) Fix MISRA 9.1 volation. +## v3.0.1 (March 2021) + - [#86]([#84](https://github.com/FreeRTOS/coreJSON/pull/86) Fix MISRA 9.1 violation. - [#84](https://github.com/FreeRTOS/coreJSON/pull/84), [#82](https://github.com/FreeRTOS/coreJSON/pull/82) and [#80](https://github.com/FreeRTOS/coreJSON/pull/80) Documentation updates and fixes. ## v3.0.0 (December 2020) diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile index 3aa0be44..4f9bf052 100644 --- a/docs/doxygen/config.doxyfile +++ b/docs/doxygen/config.doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "coreJSON" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "v3.0.0" +PROJECT_NUMBER = "v3.0.1" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/manifest.yml b/manifest.yml index 77a97ca8..35647efb 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,5 +1,5 @@ name : "coreJSON" -version: "v3.0.0" +version: "v3.0.1" description: | "A parser strictly enforcing the ECMA-404 JSON standard, suitable for microcontrollers. \n" license: "MIT" diff --git a/source/core_json.c b/source/core_json.c index d6ad4e8a..3ffa848b 100644 --- a/source/core_json.c +++ b/source/core_json.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/core_json.h b/source/include/core_json.h index 9a36caa7..c71eb5ec 100644 --- a/source/include/core_json.h +++ b/source/include/core_json.h @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/include/core_json_annex.h b/test/cbmc/include/core_json_annex.h index 55619855..1d5ea6c0 100644 --- a/test/cbmc/include/core_json_annex.h +++ b/test/cbmc/include/core_json_annex.h @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/include/skipGeneric.h b/test/cbmc/include/skipGeneric.h index 13620b51..759279d6 100644 --- a/test/cbmc/include/skipGeneric.h +++ b/test/cbmc/include/skipGeneric.h @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c b/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c index b579b88d..155c544f 100644 --- a/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c +++ b/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c b/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c index 61efc85c..c4b6e045 100644 --- a/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c +++ b/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c b/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c index 57462814..948dbbb9 100644 --- a/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c +++ b/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c b/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c index 792f2ee9..79ef9ebc 100644 --- a/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c +++ b/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipCollection/skipCollection_harness.c b/test/cbmc/proofs/skipCollection/skipCollection_harness.c index 947853c2..03b99f98 100644 --- a/test/cbmc/proofs/skipCollection/skipCollection_harness.c +++ b/test/cbmc/proofs/skipCollection/skipCollection_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipEscape/skipEscape_harness.c b/test/cbmc/proofs/skipEscape/skipEscape_harness.c index ee4eb19f..f7d831f9 100644 --- a/test/cbmc/proofs/skipEscape/skipEscape_harness.c +++ b/test/cbmc/proofs/skipEscape/skipEscape_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipNumber/skipNumber_harness.c b/test/cbmc/proofs/skipNumber/skipNumber_harness.c index 1942deb6..45e5b213 100644 --- a/test/cbmc/proofs/skipNumber/skipNumber_harness.c +++ b/test/cbmc/proofs/skipNumber/skipNumber_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipSpace/skipSpace_harness.c b/test/cbmc/proofs/skipSpace/skipSpace_harness.c index 7737139f..7bca1e1d 100644 --- a/test/cbmc/proofs/skipSpace/skipSpace_harness.c +++ b/test/cbmc/proofs/skipSpace/skipSpace_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c b/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c index d3833b8a..5a2fff45 100644 --- a/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c +++ b/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipString/skipString_harness.c b/test/cbmc/proofs/skipString/skipString_harness.c index aa268aba..e8d09f83 100644 --- a/test/cbmc/proofs/skipString/skipString_harness.c +++ b/test/cbmc/proofs/skipString/skipString_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c b/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c index 2ca7cd04..6a9c897d 100644 --- a/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c +++ b/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipAnyLiteral.c b/test/cbmc/stubs/skipAnyLiteral.c index dee4d043..fae9584d 100644 --- a/test/cbmc/stubs/skipAnyLiteral.c +++ b/test/cbmc/stubs/skipAnyLiteral.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipAnyScalar.c b/test/cbmc/stubs/skipAnyScalar.c index db148076..87a6ab32 100644 --- a/test/cbmc/stubs/skipAnyScalar.c +++ b/test/cbmc/stubs/skipAnyScalar.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipCollection.c b/test/cbmc/stubs/skipCollection.c index c0aeb4eb..7387b673 100644 --- a/test/cbmc/stubs/skipCollection.c +++ b/test/cbmc/stubs/skipCollection.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipEscape.c b/test/cbmc/stubs/skipEscape.c index 2c699ae2..03d0fdbd 100644 --- a/test/cbmc/stubs/skipEscape.c +++ b/test/cbmc/stubs/skipEscape.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipGeneric.c b/test/cbmc/stubs/skipGeneric.c index 4d08029f..29a91ce6 100644 --- a/test/cbmc/stubs/skipGeneric.c +++ b/test/cbmc/stubs/skipGeneric.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipNumber.c b/test/cbmc/stubs/skipNumber.c index 6adb3373..be76bc94 100644 --- a/test/cbmc/stubs/skipNumber.c +++ b/test/cbmc/stubs/skipNumber.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipSpace.c b/test/cbmc/stubs/skipSpace.c index 44383c71..b5cfcb49 100644 --- a/test/cbmc/stubs/skipSpace.c +++ b/test/cbmc/stubs/skipSpace.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipSpaceAndComma.c b/test/cbmc/stubs/skipSpaceAndComma.c index 5d99b2f0..8cab0cf0 100644 --- a/test/cbmc/stubs/skipSpaceAndComma.c +++ b/test/cbmc/stubs/skipSpaceAndComma.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipString.c b/test/cbmc/stubs/skipString.c index 2e0e1e59..1e0efda1 100644 --- a/test/cbmc/stubs/skipString.c +++ b/test/cbmc/stubs/skipString.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/stubs/skipUTF8.c b/test/cbmc/stubs/skipUTF8.c index 03716a4b..67459a11 100644 --- a/test/cbmc/stubs/skipUTF8.c +++ b/test/cbmc/stubs/skipUTF8.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/CMock b/test/unit-test/CMock new file mode 160000 index 00000000..afa29498 --- /dev/null +++ b/test/unit-test/CMock @@ -0,0 +1 @@ +Subproject commit afa294982e8a28bc06f341cc77fd4276641b42bd diff --git a/test/unit-test/core_json_utest.c b/test/unit-test/core_json_utest.c index 2e5d9c5d..7cf3fb14 100644 --- a/test/unit-test/core_json_utest.c +++ b/test/unit-test/core_json_utest.c @@ -1,5 +1,5 @@ /* - * coreJSON v3.0.0 + * coreJSON v3.0.1 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of From 2d6a803ef14fa6276ccf77281b001502853f6c23 Mon Sep 17 00:00:00 2001 From: Archit Aggarwal Date: Thu, 25 Feb 2021 18:58:23 +0000 Subject: [PATCH 4/4] Change month --- CHANGELOG.md | 2 +- test/unit-test/CMock | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 160000 test/unit-test/CMock diff --git a/CHANGELOG.md b/CHANGELOG.md index 7045e6a2..694b02aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for coreJSON Library -## v3.0.1 (March 2021) +## v3.0.1 (February 2021) - [#86]([#84](https://github.com/FreeRTOS/coreJSON/pull/86) Fix MISRA 9.1 violation. - [#84](https://github.com/FreeRTOS/coreJSON/pull/84), [#82](https://github.com/FreeRTOS/coreJSON/pull/82) and [#80](https://github.com/FreeRTOS/coreJSON/pull/80) Documentation updates and fixes. diff --git a/test/unit-test/CMock b/test/unit-test/CMock deleted file mode 160000 index afa29498..00000000 --- a/test/unit-test/CMock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit afa294982e8a28bc06f341cc77fd4276641b42bd