adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix: when the last server dropped connection, darkice crashed

This commit is contained in:
darkeye 2002-08-02 17:59:17 +00:00
parent 167616b011
commit 2a56e0f073
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darkice/trunk/ChangeLog
View File

@ -1,5 +1,7 @@
DarkIce 0.11 DarkIce 0.11
o bug fix: when the last server dropped connection, darkice crashed
thanks to Nicu Pavel <npavel@ituner.com>
o bug fix for LameLibEncoder: the mp3 encoding buffer was deleted too o bug fix for LameLibEncoder: the mp3 encoding buffer was deleted too
early, resulting in mp3 data corruption. early, resulting in mp3 data corruption.
thanks to Nicu Pavel <npavel@ituner.com> thanks to Nicu Pavel <npavel@ituner.com>

16
darkice/trunk/src/Connector.cpp
View File

@ -164,6 +164,7 @@ Connector :: detach ( Sink * sink ) throw ( Exception )
sinks[0] = 0; sinks[0] = 0;
delete[] sinks; delete[] sinks;
sinks = 0; sinks = 0;
--numSinks;
return true; return true;
@ -255,7 +256,6 @@ Connector :: transfer ( unsigned long bytes,
{ {
unsigned int u; unsigned int u;
unsigned long b; unsigned long b;
unsigned char * buf = new unsigned char[bufSize];
if ( numSinks == 0 ) { if ( numSinks == 0 ) {
return 0; return 0;
@ -265,6 +265,8 @@ Connector :: transfer ( unsigned long bytes,
return 0; return 0;
} }
unsigned char * buf = new unsigned char[bufSize];
reportEvent( 6, "Connector :: tranfer, bytes", bytes); reportEvent( 6, "Connector :: tranfer, bytes", bytes);
for ( b = 0; !bytes || b < bytes; ) { for ( b = 0; !bytes || b < bytes; ) {
@ -288,9 +290,6 @@ Connector :: transfer ( unsigned long bytes,
} catch ( Exception & e ) { } catch ( Exception & e ) {
sinks[u]->close(); sinks[u]->close();
detach( sinks[u].get() ); detach( sinks[u].get() );
/* with the call to detach, numSinks gets 1 lower,
* and the next sink comes to sinks[u] */
--u;
reportEvent( 4, reportEvent( 4,
"Connector :: transfer, sink removed, remaining", "Connector :: transfer, sink removed, remaining",
@ -299,8 +298,12 @@ Connector :: transfer ( unsigned long bytes,
if ( numSinks == 0 ) { if ( numSinks == 0 ) {
reportEvent( 4, reportEvent( 4,
"Connector :: transfer, no more sinks"); "Connector :: transfer, no more sinks");
break; delete[] buf;
return b;
} }
/* with the call to detach, numSinks gets 1 lower,
* and the next sink comes to sinks[u] */
--u;
} }
} }
} }
@ -338,6 +341,9 @@ Connector :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.9 2002/08/02 17:59:17 darkeye
bug fix: when the last server dropped connection, darkice crashed
Revision 1.8 2002/07/20 16:37:06 darkeye Revision 1.8 2002/07/20 16:37:06 darkeye
added fault tolerance in case a server connection is dropped added fault tolerance in case a server connection is dropped