kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pbulk-base: fix double free().

Browse source 
Debugged by dillo & myself.

Bump version.
This commit is contained in:
wiz 2019-03-12 15:37:51 +00:00
parent 50d39b008b
commit 3cebc398f4
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/pbulk-base/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.24 2016/06/23 15:07:39 joerg Exp $
# $NetBSD: Makefile,v 1.25 2019/03/12 15:37:51 wiz Exp $
DISTNAME= pbulk-base-0.53
DISTNAME= pbulk-base-0.54
COMMENT= Core components of the modular bulk build framework
.include "../../pkgtools/pbulk/Makefile.common"

14
pkgtools/pbulk/files/pbulk/lib/event.c
View file

@ -1,4 +1,4 @@
/* $NetBSD: event.c,v 1.8 2017/02/25 21:21:53 joerg Exp $ */
/* $NetBSD: event.c,v 1.9 2019/03/12 15:37:51 wiz Exp $ */
/*-
* Copyright (c) 2007, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -51,6 +51,8 @@
#include "pbulk.h"
static struct event *poll_loop_next = NULL;
struct deferred_read_arg {
void *cb_arg;
void (*cb_ok)(void *);
@ -206,6 +208,9 @@ event_add(struct event *ev, int fd, int do_write, int is_persistent,
void
event_del(struct event *ev)
{
if (ev == poll_loop_next) {
poll_loop_next = LIST_NEXT(ev, ev_link);
}
LIST_REMOVE(ev, ev_link);
--active_events;
}
@ -303,7 +308,7 @@ void
event_dispatch(void)
{
struct timeval now;
struct event *ev, *next;
struct event *ev;
struct pollfd *iter, *last_iter;
int ret, timeout;
@ -345,8 +350,8 @@ loop:
if (ret > 0) {
iter = poll_list;
for (ev = LIST_FIRST(&all_events);
iter < last_iter && ev && (next = LIST_NEXT(ev, ev_link), 1);
ev = next, ++iter) {
iter < last_iter && ev && (poll_loop_next = LIST_NEXT(ev, ev_link), 1);
ev = poll_loop_next, ++iter) {
if (iter->revents) {
if (!ev->ev_persistent) {
--active_events;
@ -356,6 +361,7 @@ loop:
--ret;
}
}
poll_loop_next = NULL;
}
goto loop;
}