Changeset 645:6cbe070ef8fc in roaraudio

Timestamp:

08/25/08 13:31:36 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make primary streams work without double-free while quit

File:

• roard/streams.c (modified) (2 diffs)

roard/streams.c

@@ -86 +86 @@
 int streams_delete (int id) {
  struct roar_stream_server * s;
+ int prim;
+
  if ( (s = g_streams[id]) == NULL )
   return 0;
@@ -112 +114 @@
   close(ROAR_STREAM(s)->fh);
 
- if ( s->primary ) {
+ prim = s->primary;
+
+ free(s);
+
+ g_streams[id] = NULL;
+
+ if ( prim ) {
   alive = 0;
   clean_quit();
  }
-
- free(s);
-
- g_streams[id] = NULL;
 
  ROAR_DBG("streams_delete(id=%i) = 0", id);