Merge branch 'main' into dev

Author: thiagomacieira

Makefile

@@ -134,7 +134,7 @@ silentcheck: | $(BINLIBRARY)
 	TESTARGS=-silent $(MAKE) -f $(MAKEFILE) -s check
 configure: .config
 .config: Makefile.configure
-	$(MAKE) -f $(SRCDIR)Makefile.configure OUT='>&9' configure 9> $@
+	$(MAKE) -f $(SRCDIR)Makefile.configure OUT='$@' configure
 
 lib/libtinycbor-freestanding.a: $(TINYCBOR_FREESTANDING_SOURCES:.c=.o)
 	@$(MKDIR) -p lib
@@ -236,10 +236,16 @@ tag: distcheck
 .SECONDARY:
 
 cflags := $(CPPFLAGS) -I$(SRCDIR)src
-cflags += -std=gnu99 $(CFLAGS) \
+cflags += -std=gnu99 $(CFLAGS)
+
+ifneq ($(DISABLE_WERROR),1)
+cflags += \
+	-Werror=discarded-qualifiers \
 	-Werror=incompatible-pointer-types \
 	-Werror=implicit-function-declaration \
 	-Werror=int-conversion
+endif
+
 %.o: %.c
 	@test -d $(@D) || $(MKDIR) $(@D)
 	$(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $<

Makefile.configure

@@ -27,9 +27,9 @@ sink:
 configure: $(foreach it,$(ALLTESTS),check-$(it))
 
 check-%:
-	@echo $(subst check-,,$@)-tested := 1 $(OUT)
+	@echo $(subst check-,,$@)-tested := 1 >>$(OUT)
 	$(if $(V),,@)if printf "$($(subst check-,PROGRAM-,$@))" | \
 	    $(CC) -xc $($(subst check-,CCFLAGS-,$@)) -o /dev/null - $(if $(V),,>/dev/null 2>&1); \
 	then \
-	    echo $(subst check-,,$@)-pass := 1 $(OUT); \
+	    echo $(subst check-,,$@)-pass := 1 >>$(OUT); \
 	fi

src/cborparser.c

@@ -1211,7 +1211,7 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
             return CborErrorDataTooLarge;
 
         if (*result && *buflen >= newTotal)
-            *result = !!func(buffer + total, (const uint8_t *)ptr, chunkLen);
+            *result = !!func(buffer == NULL ? buffer : buffer + total, (const uint8_t *)ptr, chunkLen);
         else
             *result = false;
 
@@ -1221,7 +1221,7 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
     /* is there enough room for the ending NUL byte? */
     if (*result && *buflen > total) {
         uint8_t nul[] = { 0 };
-        *result = !!func(buffer + total, nul, 1);
+        *result = !!func(buffer == NULL ? buffer : buffer + total, nul, 1);
     }
     *buflen = total;
     return _cbor_value_finish_string_iteration(next);

src/cbortojson.c

@@ -25,7 +25,6 @@
 #define _BSD_SOURCE 1
 #define _DEFAULT_SOURCE 1
 #define _GNU_SOURCE 1
-#define _POSIX_C_SOURCE 200809L
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif

src/cborvalidation.c

@@ -647,7 +647,7 @@ CborError cbor_value_validate(const CborValue *it, uint32_t flags)
     CborError err = validate_value(&value, flags, CBOR_PARSER_MAX_RECURSIONS);
     if (err)
         return err;
-    if (flags & CborValidateCompleteData && can_read_bytes(it, 1))
+    if (flags & CborValidateCompleteData && can_read_bytes(&value, 1))
         return CborErrorGarbageAtEnd;
     return CborNoError;
 }

src/compilersupport_p.h

@@ -156,7 +156,7 @@
     (defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && BYTE_ORDER == LITTLE_ENDIAN) || \
     defined(_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || defined(__MIPSEL__) || \
     defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)
-#      define ntohll(x)       ((ntohl((uint32_t)(x)) * UINT64_C(0x100000000)) + (ntohl((x) >> 32)))
+#      define ntohll(x)       ((cbor_ntohl((uint32_t)(x)) * UINT64_C(0x100000000)) + (cbor_ntohl((x) >> 32)))
 #      define htonll          ntohll
 #    else
 #      error "Unable to determine byte order!"
@@ -202,4 +202,3 @@ static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r)
 }
 
 #endif /* COMPILERSUPPORT_H */
-

tests/parser/tst_parser.cpp

@@ -106,6 +106,8 @@ private slots:
     // validation & errors
     void checkedIntegers_data();
     void checkedIntegers();
+    void validationValid_data() { arrays_data(); }
+    void validationValid();
     void validation_data();
     void validation();
     void strictValidation_data();
@@ -1337,6 +1339,21 @@ void tst_Parser::checkedIntegers()
     }
 }
 
+void tst_Parser::validationValid()
+{
+    // verify that all valid data validate properly
+    QFETCH(QByteArray, data);
+
+    QString decoded;
+    ParserWrapper w;
+    CborError err = w.init(data);
+    QVERIFY2(!err, QByteArray("Got error \"") + cbor_error_string(err) + "\"");
+
+    QCOMPARE(cbor_value_validate_basic(&w.first), CborNoError);
+    QCOMPARE(cbor_value_validate(&w.first, CborValidateBasic), CborNoError);
+    QCOMPARE(cbor_value_validate(&w.first, CborValidateCompleteData), CborNoError);
+}
+
 void tst_Parser::validation_data()
 {
     addValidationColumns();

tools/json2cbor/json2cbor.c

@@ -22,7 +22,6 @@
 **
 ****************************************************************************/
 
-#define _POSIX_C_SOURCE 200809L
 #define _GNU_SOURCE
 #include "cbor.h"
 #include "cborinternal_p.h"