Skip to content

Fix zbuffer empty string writes #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redboltz merged 4 commits into from
Jun 23, 2015
Merged

Fix zbuffer empty string writes #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
addf52e
Fix zbuffer write of empty string
llchan Jun 22, 2015
9a50cc4
Add zbuffer empty string write tests
llchan Jun 22, 2015
89f117f
Destroy zbuffer in C unit test
llchan Jun 22, 2015
22e428b
Add static inline to zbuffer.h function definitions
llchan Jun 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions include/msgpack/zbuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static inline int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf);


bool msgpack_zbuffer_init(msgpack_zbuffer* zbuf,
static inline bool msgpack_zbuffer_init(msgpack_zbuffer* zbuf,
int level, size_t init_size)
{
memset(zbuf, 0, sizeof(msgpack_zbuffer));
Expand All @@ -82,13 +82,13 @@ bool msgpack_zbuffer_init(msgpack_zbuffer* zbuf,
return true;
}

void msgpack_zbuffer_destroy(msgpack_zbuffer* zbuf)
static inline void msgpack_zbuffer_destroy(msgpack_zbuffer* zbuf)
{
deflateEnd(&zbuf->stream);
free(zbuf->data);
}

msgpack_zbuffer* msgpack_zbuffer_new(int level, size_t init_size)
static inline msgpack_zbuffer* msgpack_zbuffer_new(int level, size_t init_size)
{
msgpack_zbuffer* zbuf = (msgpack_zbuffer*)malloc(sizeof(msgpack_zbuffer));
if (zbuf == NULL) return NULL;
Expand All @@ -99,14 +99,14 @@ msgpack_zbuffer* msgpack_zbuffer_new(int level, size_t init_size)
return zbuf;
}

void msgpack_zbuffer_free(msgpack_zbuffer* zbuf)
static inline void msgpack_zbuffer_free(msgpack_zbuffer* zbuf)
{
if(zbuf == NULL) { return; }
msgpack_zbuffer_destroy(zbuf);
free(zbuf);
}

bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
{
size_t used = (char*)zbuf->stream.next_out - zbuf->data;
size_t csize = used + zbuf->stream.avail_out;
Expand All @@ -124,14 +124,14 @@ bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
return true;
}

int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
static inline int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
{
msgpack_zbuffer* zbuf = (msgpack_zbuffer*)data;

zbuf->stream.next_in = (Bytef*)buf;
zbuf->stream.avail_in = len;

do {
while(zbuf->stream.avail_in > 0) {
if(zbuf->stream.avail_out < MSGPACK_ZBUFFER_RESERVE_SIZE) {
if(!msgpack_zbuffer_expand(zbuf)) {
return -1;
Expand All @@ -141,12 +141,12 @@ int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
if(deflate(&zbuf->stream, Z_NO_FLUSH) != Z_OK) {
return -1;
}
} while(zbuf->stream.avail_in > 0);
}

return 0;
}

char* msgpack_zbuffer_flush(msgpack_zbuffer* zbuf)
static inline char* msgpack_zbuffer_flush(msgpack_zbuffer* zbuf)
{
while(true) {
switch(deflate(&zbuf->stream, Z_FINISH)) {
Expand All @@ -163,23 +163,23 @@ char* msgpack_zbuffer_flush(msgpack_zbuffer* zbuf)
}
}

const char* msgpack_zbuffer_data(const msgpack_zbuffer* zbuf)
static inline const char* msgpack_zbuffer_data(const msgpack_zbuffer* zbuf)
{
return zbuf->data;
}

size_t msgpack_zbuffer_size(const msgpack_zbuffer* zbuf)
static inline size_t msgpack_zbuffer_size(const msgpack_zbuffer* zbuf)
{
return (char*)zbuf->stream.next_out - zbuf->data;
}

void msgpack_zbuffer_reset_buffer(msgpack_zbuffer* zbuf)
static inline void msgpack_zbuffer_reset_buffer(msgpack_zbuffer* zbuf)
{
zbuf->stream.avail_out += (char*)zbuf->stream.next_out - zbuf->data;
zbuf->stream.next_out = (Bytef*)zbuf->data;
}

bool msgpack_zbuffer_reset(msgpack_zbuffer* zbuf)
static inline bool msgpack_zbuffer_reset(msgpack_zbuffer* zbuf)
{
if(deflateReset(&zbuf->stream) != Z_OK) {
return false;
Expand All @@ -188,7 +188,7 @@ bool msgpack_zbuffer_reset(msgpack_zbuffer* zbuf)
return true;
}

char* msgpack_zbuffer_release_buffer(msgpack_zbuffer* zbuf)
static inline char* msgpack_zbuffer_release_buffer(msgpack_zbuffer* zbuf)
{
char* tmp = zbuf->data;
zbuf->data = NULL;
Expand Down
4 changes: 2 additions & 2 deletions include/msgpack/zbuffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class zbuffer {
m_stream.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(buf));
m_stream.avail_in = len;

do {
while(m_stream.avail_in > 0) {
if(m_stream.avail_out < MSGPACK_ZBUFFER_RESERVE_SIZE) {
if(!expand()) {
throw std::bad_alloc();
Expand All @@ -75,7 +75,7 @@ class zbuffer {
if(deflate(&m_stream, Z_NO_FLUSH) != Z_OK) {
throw std::bad_alloc();
}
} while(m_stream.avail_in > 0);
}
}

char* flush()
Expand Down
17 changes: 17 additions & 0 deletions test/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <msgpack/fbuffer.hpp>
#include <msgpack/fbuffer.h>
#include <msgpack/zbuffer.hpp>
#include <msgpack/zbuffer.h>
#include <gtest/gtest.h>
#include <string.h>

Expand Down Expand Up @@ -68,11 +69,27 @@ TEST(buffer, zbuffer)
zbuf.write("a", 1);
zbuf.write("a", 1);
zbuf.write("a", 1);
zbuf.write("", 0);

zbuf.flush();
}


TEST(buffer, zbuffer_c)
{
msgpack_zbuffer zbuf;
EXPECT_TRUE(msgpack_zbuffer_init(&zbuf, 1, MSGPACK_ZBUFFER_INIT_SIZE));
EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "", 0));

EXPECT_TRUE(msgpack_zbuffer_flush(&zbuf) != NULL);

msgpack_zbuffer_destroy(&zbuf);
}


TEST(buffer, fbuffer)
{
FILE* file = tmpfile();
Expand Down