Commit efb868ce authored by Scott Vokes's avatar Scott Vokes
Browse files

Swap bytesUsed value, preventing prematurely truncated buffers.

parent 08b433f8

src/lib/byte_array.c

+2 −3
Original line number Diff line number Diff line
@@ -90,12 +90,11 @@ ByteBuffer ByteBuffer_CreateAndAppendFormattedCString(void* data, size_t max_len 


    int formattedSize = vsnprintf((void*)tmpBuf.array.data, tmpBuf.array.len, format, args);

    assert(formattedSize >= 0);

    tmpBuf.bytesUsed = (tmpBuf.array.len <= (size_t)formattedSize) ? formattedSize : tmpBuf.array.len;

    tmpBuf.bytesUsed = (tmpBuf.array.len <= (size_t)formattedSize) ? tmpBuf.array.len : formattedSize;



    va_end(args);



    ByteBuffer_AppendBuffer(&buf, tmpBuf);



    return buf;

}
@@ -191,7 +190,7 @@ ByteBuffer* ByteBuffer_AppendFormattedCString(ByteBuffer* buffer, const char * f 


    int formattedSize = vsnprintf((void*)tmpBuf.array.data, tmpBuf.array.len, format, args);

    assert(formattedSize >= 0);

    tmpBuf.bytesUsed = (tmpBuf.array.len <= (size_t)formattedSize) ? formattedSize : tmpBuf.array.len;

    tmpBuf.bytesUsed = (tmpBuf.array.len <= (size_t)formattedSize) ? tmpBuf.array.len : formattedSize;



    va_end(args);