cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix double free(); from maintainer Moritz Grimm

Browse Source
This commit is contained in:
naddy 2005-10-21 16:14:02 +00:00
parent 5e262d19fa
commit a22a26be38
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ices2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2005/04/18 20:14:34 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2005/10/21 16:14:02 naddy Exp $
COMMENT= "icecast source for streaming Ogg Vorbis"
DISTNAME= ices-2.0.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= net audio
HOMEPAGE= http://www.icecast.org/
@ -22,6 +22,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ices/
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --program-suffix=2
USE_LIBTOOL= Yes
MODULES= converters/libiconv
BUILD_DEPENDS= ::devel/pkgconfig
LIB_DEPENDS= shout.3::net/libshout \

24
net/ices2/patches/patch-src_stream_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_stream_c,v 1.1 2005/10/21 16:14:02 naddy Exp $
--- src/stream.c.orig Fri Nov 5 20:19:54 2004
+++ src/stream.c Tue Oct 18 14:45:00 2005
@@ -295,9 +295,10 @@ void *ices_instance_stream(void *arg)
stream->reconnect_attempts==-1) &&
!ices_config->shutdown)
{
- i++;
LOG_WARN0("Trying reconnect after server socket error");
- shout_close(sdsc->shout);
+ if(i == 0)
+ shout_close(sdsc->shout);
+ i++;
if((shouterr = shout_open(sdsc->shout)) == SHOUTERR_SUCCESS)
{
LOG_INFO3("Connected to server: %s:%d%s",
@@ -329,6 +330,7 @@ void *ices_instance_stream(void *arg)
}
else /* Don't try again too soon */
thread_sleep (stream->reconnect_delay*1000000);
+ sdsc->shout = NULL;
}
}
stream->skip = 0;