Skip to content

Commit 747f54a

Browse files
committed
check null pointer before using memcpy()
1 parent 82ddfc1 commit 747f54a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

include/msgpack/sbuffer.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ static inline void msgpack_sbuffer_free(msgpack_sbuffer* sbuf)
5959
static inline int msgpack_sbuffer_write(void* data, const char* buf, size_t len)
6060
{
6161
msgpack_sbuffer* sbuf = (msgpack_sbuffer*)data;
62+
assert(buf || len == 0);
6263

6364
if(sbuf->alloc - sbuf->size < len) {
6465
void* tmp;
@@ -81,8 +82,10 @@ static inline int msgpack_sbuffer_write(void* data, const char* buf, size_t len)
8182
sbuf->alloc = nsize;
8283
}
8384

84-
memcpy(sbuf->data + sbuf->size, buf, len);
85-
sbuf->size += len;
85+
if(buf) {
86+
memcpy(sbuf->data + sbuf->size, buf, len);
87+
sbuf->size += len;
88+
}
8689
return 0;
8790
}
8891

0 commit comments

Comments
 (0)