Moritz Grimm <[EMAIL PROTECTED]> wrote: > * Fix another double-free() that, unfortunately, didn't make it into 2.2 > in time [...] > diff -pruN --exclude=CVS /usr/ports/net/libshout/patches/patch-src_shout_c > ./patches/patch-src_shout_c > --- /usr/ports/net/libshout/patches/patch-src_shout_c Tue Apr 19 22:07:11 2005 > +++ ./patches/patch-src_shout_c Fri Jan 6 12:31:10 2006 > @@ -1,7 +1,36 @@ > $OpenBSD: patch-src_shout_c,v 1.1 2005/04/19 20:07:11 sturm Exp $ > ---- src/shout.c.orig Sun Apr 17 12:25:25 2005 > -+++ src/shout.c Sun Apr 17 12:51:32 2005 > -@@ -489,7 +489,7 @@ int shout_set_mount(shout_t *self, const > +--- src/shout.c.orig Tue Jan 3 19:56:39 2006 > ++++ src/shout.c Fri Jan 6 12:30:31 2006 > +@@ -165,6 +165,8 @@ int shout_close(shout_t *self) > + if (self->close) > + self->close(self); > + > ++ self->close = NULL; > ++ self->send = NULL; > + sock_close(self->socket); > + self->state = SHOUT_STATE_UNCONNECTED; > + self->starttime = 0; > +@@ -183,6 +185,9 @@ int shout_send(shout_t *self, const unsi > + if (self->state != SHOUT_STATE_CONNECTED) > + return self->error = SHOUTERR_UNCONNECTED; > + > ++ if (self->send == NULL) > ++ return self->error = SHOUTERR_NOCONNECT; > ++ > + if (self->starttime <= 0) > + self->starttime = timing_get_time(); > + > +@@ -202,6 +207,9 @@ ssize_t shout_send_raw(shout_t *self, co > + if (self->state != SHOUT_STATE_CONNECTED) > + return SHOUTERR_UNCONNECTED; > + > ++ if (self->send == NULL) > ++ return self->error = SHOUTERR_NOCONNECT; > ++ > + self->error = SHOUTERR_SUCCESS; > + > + /* send immediately if possible (should be the common case) */
Is this "another double-free()" fix? I don't see it in libshout SVN repo at http://svn.xiph.org/icecast/trunk/libshout ... Alek -- W stroboskopowej burzy do źrenic D.U. dociera jeden obraz: strojący na kontenerach strażnicy padają jak drzewa podcięte huraganem, a między ich nogami i nad dachami kontenerów przemyka z szybkością światła cybernetyczny cień, sinusoidalne tsunami -- Sfora Szczurojamników. -- Neal Stephenson, Zamieć
