Skip to content
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

Buffer leak #164

Merged
merged 3 commits into from
Aug 25, 2017
+3 −0
Merged

Buffer leak #164

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd24299
free char buffer when cleaning up ByteBuffer object
Aug 24, 2017
9ecf920
initialize buffer, as initialization may fail to mallocate the buffer
Aug 24, 2017
9933c42
moved buffer initialization to allocate
Aug 24, 2017
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
4 changes: 3 additions & 1 deletion ext/nio4r/bytebuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ static void NIO_ByteBuffer_gc_mark(struct NIO_ByteBuffer *buffer)

static void NIO_ByteBuffer_free(struct NIO_ByteBuffer *buffer)
{
xfree(buffer->buffer);
if(buffer->buffer)
xfree(buffer->buffer);
xfree(buffer);
}

Expand All @@ -93,6 +94,7 @@ static VALUE NIO_ByteBuffer_initialize(VALUE self, VALUE capacity)
struct NIO_ByteBuffer *buffer;
Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);

buffer->buffer = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would probably be safer to do this in allocate

buffer->capacity = NUM2INT(capacity);
buffer->buffer = xmalloc(buffer->capacity);

Expand Down