Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Icecast-Server
Commits
1d5c1ebd
Commit
1d5c1ebd
authored
Aug 29, 2005
by
Karl Heyes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix double free bug with failed to start relays and add a guard on refbuf release
svn path=/icecast/trunk/icecast/; revision=9859
parent
a4b03ad2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
src/refbuf.c
src/refbuf.c
+2
-1
src/slave.c
src/slave.c
+2
-3
No files found.
src/refbuf.c
View file @
1d5c1ebd
...
...
@@ -66,6 +66,8 @@ void refbuf_addref(refbuf_t *self)
void
refbuf_release
(
refbuf_t
*
self
)
{
if
(
self
==
NULL
)
return
;
self
->
_count
--
;
if
(
self
->
_count
==
0
)
{
while
(
self
->
associated
)
...
...
@@ -76,7 +78,6 @@ void refbuf_release(refbuf_t *self)
}
free
(
self
->
data
);
free
(
self
);
return
;
}
}
src/slave.c
View file @
1d5c1ebd
...
...
@@ -243,9 +243,10 @@ static void *start_relay_stream (void *arg)
/* make sure only the client_destory frees these */
con
=
NULL
;
parser
=
NULL
;
streamsock
=
SOCK_ERROR
;
break
;
}
con
=
NULL
;
parser
=
NULL
;
client_set_queue
(
src
->
client
,
NULL
);
if
(
connection_complete_source
(
src
,
0
)
<
0
)
...
...
@@ -286,8 +287,6 @@ static void *start_relay_stream (void *arg)
avl_tree_unlock
(
global
.
source_tree
);
}
if
(
con
==
NULL
&&
streamsock
!=
SOCK_ERROR
)
sock_close
(
streamsock
);
if
(
con
)
connection_close
(
con
);
src
->
con
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment