X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fvendor%2Fmsgpack%2Fsbuffer.h;h=572d8f27e683ed33704acae9a761db893e351810;hb=0c07860d8c0160fea35c59fc5d43b948f354359e;hp=c494bae77a5e13225fb5f020e6eee0fd268397d9;hpb=116a02e33a6aba03128c268c333e1c35584848d2;p=lttng-tools.git diff --git a/src/vendor/msgpack/sbuffer.h b/src/vendor/msgpack/sbuffer.h index c494bae77..572d8f27e 100644 --- a/src/vendor/msgpack/sbuffer.h +++ b/src/vendor/msgpack/sbuffer.h @@ -12,6 +12,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -60,6 +61,9 @@ static inline int msgpack_sbuffer_write(void* data, const char* buf, size_t len) { msgpack_sbuffer* sbuf = (msgpack_sbuffer*)data; + assert(buf || len == 0); + if(!buf) return 0; + if(sbuf->alloc - sbuf->size < len) { void* tmp; size_t nsize = (sbuf->alloc) ? @@ -83,6 +87,7 @@ static inline int msgpack_sbuffer_write(void* data, const char* buf, size_t len) memcpy(sbuf->data + sbuf->size, buf, len); sbuf->size += len; + return 0; }