Skip to content
Snippets Groups Projects
Commit 05af47f0 authored by Dan Egnor's avatar Dan Egnor
Browse files

fixes to RJKs valgrind errors

parent 4daa1fa2
No related branches found
No related tags found
No related merge requests found
......@@ -38,6 +38,7 @@ oop_adapter_select *oop_select_new(
FD_ZERO(&s->active.wfd);
FD_ZERO(&s->active.xfd);
s->num_fd = 0;
s->num_fd_active = 0;
s->do_timeout = 0;
s->is_active = 0;
s->call = call;
......
......@@ -86,12 +86,13 @@ static void sys_on_fd(oop_source *source,int fd,oop_event ev,
int i,j,num_files = 1 + fd;
sys_file *files = oop_malloc(num_files * sizeof(sys_file));
if (NULL == files) return; /* ugh */
memcpy(files,sys->files,sizeof(sys_file) * sys->num_files);
for (i = sys->num_files; i < num_files; ++i)
for (j = 0; j < OOP_NUM_EVENTS; ++j)
files[i][j].f = NULL;
oop_free(sys->files);
if (NULL != sys->files) oop_free(sys->files);
sys->files = files;
sys->num_files = num_files;
}
......@@ -414,6 +415,7 @@ void oop_sys_delete(oop_source_sys *sys) {
assert(NULL == sys->files[i][j].f && "cannot delete with file handler");
assert(0 == sys->num_events);
if (NULL != sys->files) oop_free(sys->files);
oop_free(sys);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment