malloc-based string allocator is fixed, tested and working. Other cleanup
diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index ab8ce57..9a789d7 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -222,9 +222,10 @@
/*
Public function, see header file
*/
-void QCBORDecode_SetUpAllocator(QCBORDecodeContext *pCtx, const QCBORStringAllocator *pAllocator)
+void QCBORDecode_SetUpAllocator(QCBORDecodeContext *pCtx, const QCBORStringAllocator *pAllocator, bool bAllocAll)
{
pCtx->pStringAllocator = (void *)pAllocator;
+ pCtx->bStringAllocateAll = bAllocAll;
}
@@ -438,29 +439,34 @@
/*
- Decode text and byte strings
+ Decode text and byte strings. Call the string allocator if asked to.
*/
inline static int DecodeBytes(QCBORStringAllocator *pAlloc, int nMajorType, uint64_t uStrLen, UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem)
{
- UsefulBufC Bytes = UsefulInputBuf_GetUsefulBuf(pUInBuf, uStrLen);
+ int nReturn = QCBOR_SUCCESS;
- int nReturn = QCBOR_ERR_HIT_END;
-
- if(!UsefulBuf_IsNULLC(Bytes)) {
- if(pAlloc) {
- UsefulBuf NewMem = pAlloc->fAllocate(pAlloc->pAllocaterContext, NULL, uStrLen);
- if(!UsefulBuf_IsNULL(NewMem)) {
- pDecodedItem->val.string = UsefulBuf_Copy(NewMem, Bytes);
- } else {
- return QCBOR_ERR_STRING_ALLOC;
- }
- } else {
- pDecodedItem->val.string = Bytes;
- }
- pDecodedItem->uDataType = (nMajorType == CBOR_MAJOR_TYPE_BYTE_STRING) ? QCBOR_TYPE_BYTE_STRING : QCBOR_TYPE_TEXT_STRING;
- nReturn = QCBOR_SUCCESS;
+ UsefulBufC Bytes = UsefulInputBuf_GetUsefulBuf(pUInBuf, uStrLen);
+ if(UsefulBuf_IsNULLC(Bytes)) {
+ // Failed to get the bytes for this string item
+ nReturn = QCBOR_ERR_HIT_END;
+ goto Done;
}
+
+ if(pAlloc) {
+ // We are asked to use string allocator to make a copy
+ UsefulBuf NewMem = pAlloc->fAllocate(pAlloc->pAllocaterContext, NULL, uStrLen);
+ if(UsefulBuf_IsNULL(NewMem)) {
+ nReturn = QCBOR_ERR_STRING_ALLOC;
+ goto Done;
+ }
+ pDecodedItem->val.string = UsefulBuf_Copy(NewMem, Bytes);
+ } else {
+ // Normal case with no string allocator
+ pDecodedItem->val.string = Bytes;
+ }
+ pDecodedItem->uDataType = (nMajorType == CBOR_MAJOR_TYPE_BYTE_STRING) ? QCBOR_TYPE_BYTE_STRING : QCBOR_TYPE_TEXT_STRING;
+Done:
return nReturn;
}
@@ -586,8 +592,8 @@
if(nReturn)
goto Done;
- pDecodedItem->uTagBits = 0;
- pDecodedItem->uTag = 0;
+ pDecodedItem->uTagBits = 0;
+ pDecodedItem->uTag = 0;
pDecodedItem->uDataAlloc = 0;
// At this point the major type and the value are valid. We've got the type and the number that
@@ -645,7 +651,8 @@
/*
This layer deals with indefinite length strings. It pulls all the
- individual segment items together into one QCBORItem.
+ individual segment items together into one QCBORItem using the
+ string allocator.
Code Reviewers: THIS FUNCTION DOES A LITTLE POINTER MATH
*/
@@ -653,6 +660,7 @@
{
int nReturn;
QCBORStringAllocator *pAlloc = (QCBORStringAllocator *)me->pStringAllocator;
+ UsefulBufC FullString = NULLUsefulBufC;
nReturn = GetNext_Item(&(me->InBuf), pDecodedItem, me->bStringAllocateAll ? pAlloc: NULL);
if(nReturn) {
@@ -684,18 +692,17 @@
const uint8_t uStringType = pDecodedItem->uDataType;
// Loop getting segments of indefinite string
- UsefulBufC FullString = NULLUsefulBufC;
for(;;) {
// Get item for next segment
- QCBORItem Item;
- // NULL passed to never alloc segments of indefinite length strings
- nReturn = GetNext_Item(&(me->InBuf), &Item, NULL);
+ QCBORItem StringSegmentItem;
+ // NULL passed to never string alloc segments of indefinite length strings
+ nReturn = GetNext_Item(&(me->InBuf), &StringSegmentItem, NULL);
if(nReturn) {
break; // Error getting the next segment
}
// See if it is a marker at end of indefinite length string
- if(Item.uDataType == QCBOR_TYPE_BREAK) {
+ if(StringSegmentItem.uDataType == QCBOR_TYPE_BREAK) {
// String is complete
pDecodedItem->val.string = FullString;
pDecodedItem->uDataAlloc = 1;
@@ -704,27 +711,27 @@
// Match data type of segment to type at beginning.
// Also catches error of other non-string types that don't belong.
- if(Item.uDataType != uStringType) {
+ if(StringSegmentItem.uDataType != uStringType) {
nReturn = QCBOR_ERR_INDEFINITE_STRING_SEG;
break;
}
- // Expand the buffer so it can fit
+ // Alloc new buffer or expand previously allocated buffer so it can fit
UsefulBuf NewMem = (*pAlloc->fAllocate)(pAlloc->pAllocaterContext,
UNCONST_POINTER(FullString.ptr),
- FullString.len + Item.val.string.len);
+ FullString.len + StringSegmentItem.val.string.len);
if(UsefulBuf_IsNULL(NewMem)) {
// Allocation of memory for the string failed
nReturn = QCBOR_ERR_STRING_ALLOC;
break;
}
- // Copy data to the end of it.
- FullString = UsefulBuf_CopyOffset(NewMem, FullString.len, Item.val.string);
+ // Copy new string segment at the end of string so far.
+ FullString = UsefulBuf_CopyOffset(NewMem, FullString.len, StringSegmentItem.val.string);
}
Done:
- if(pAlloc && nReturn && FullString.ptr) {
+ if(pAlloc && nReturn && !UsefulBuf_IsNULLC(FullString)) {
// Getting item failed, clean up the allocated memory
(pAlloc->fFree)(pAlloc->pAllocaterContext, UNCONST_POINTER(FullString.ptr));
}
diff --git a/src/qcbor_decode_malloc.c b/src/qcbor_decode_malloc.c
index 4e405e0..9b43c75 100644
--- a/src/qcbor_decode_malloc.c
+++ b/src/qcbor_decode_malloc.c
@@ -1,22 +1,44 @@
-//
-// qcbor_decode_malloc.c
-// QCBOR
-//
-// Created by Laurence Lundblade on 10/1/18.
-// Copyright © 2018 Laurence Lundblade. All rights reserved.
-//
+/*==============================================================================
+ float_tests.c -- tests for float and conversion to/from half-precision
+
+ Copyright 2018 Laurence Lundblade
+
+ 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.
+
+ (This is the MIT license)
+ ==============================================================================*/
#include "qcbor.h"
#include <stdlib.h> // for realloc and free
static UsefulBuf MemMallocAlloc(void *ctx, void *pOldMem, size_t uNewSize)
{
+ (void)ctx;
void *pNewMem = realloc(pOldMem, uNewSize);
return (UsefulBuf){pNewMem, uNewSize};
}
static void MemMallocFree(void *ctx, void *old)
{
+ (void)ctx;
free(old);
}
@@ -24,8 +46,9 @@
{
free(ctx);
}
-
-
+/*
+ Public function. See qcbor.h
+ */
QCBORStringAllocator *QCBORDecode_MakeMallocStringAllocator()
{
QCBORStringAllocator *pAllocaterContext = malloc(sizeof(QCBORStringAllocator));
@@ -33,33 +56,12 @@
pAllocaterContext->fAllocate = MemMallocAlloc;
pAllocaterContext->fFree = MemMallocFree;
pAllocaterContext->fDestructor = MemMallocDestructor;
+ pAllocaterContext->pAllocaterContext = pAllocaterContext; // So that destructor can work.
}
return pAllocaterContext;
}
-/*
-void QCBORDecodeMalloc_Init(QCBORDecodeContext *me, UsefulBufC EncodedCBOR, int8_t nDecodeMode)
-{
- QCBORDecode_Init(me, EncodedCBOR, nDecodeMode);
-
- QCBORStringAllocator *pAllocaterContext = malloc(sizeof(QCBORStringAllocator));
-
- pAllocaterContext->fAllocate = MemMalloc;
- pAllocaterContext->fFree = MemFree;
-
- QCBORDecode_SetUpAllocator(me, pAllocaterContext);
-}
-
-
-int QCBORDecodeMalloc_Finish(QCBORDecodeContext *me)
-{
- const QCBORStringAllocator *pAllocator = QCBORDecode_GetAllocator(me);
-
- free((void *)pAllocator); // TODO: better way to cast away const here
- return QCBORDecode_Finish(me);
-} */
-