Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
8b6568da
Commit
8b6568da
authored
Oct 06, 2008
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean discovery_add_local_host_candidate to avoid memleaks if an error occurs
parent
02fd911e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
45 deletions
+40
-45
agent/discovery.c
agent/discovery.c
+40
-45
No files found.
agent/discovery.c
View file @
8b6568da
...
...
@@ -289,57 +289,52 @@ NiceCandidate *discovery_add_local_host_candidate (
candidate
=
nice_candidate_new
(
NICE_CANDIDATE_TYPE_HOST
);
if
(
candidate
)
{
NiceUDPSocket
*
udp_socket
=
g_slice_new0
(
NiceUDPSocket
);
if
(
udp_socket
)
{
candidate
->
stream_id
=
stream_id
;
candidate
->
component_id
=
component_id
;
candidate
->
addr
=
*
address
;
candidate
->
base_addr
=
*
address
;
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_GOOGLE
)
{
candidate
->
priority
=
nice_candidate_jingle_priority
(
candidate
)
*
1000
;
}
else
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_MSN
)
{
candidate
->
priority
=
nice_candidate_msn_priority
(
candidate
)
*
1000
;
}
else
{
candidate
->
priority
=
nice_candidate_ice_priority
(
candidate
);
}
candidate
->
stream_id
=
stream_id
;
candidate
->
component_id
=
component_id
;
candidate
->
addr
=
*
address
;
candidate
->
base_addr
=
*
address
;
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_GOOGLE
)
{
candidate
->
priority
=
nice_candidate_jingle_priority
(
candidate
)
*
1000
;
}
else
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_MSN
)
{
candidate
->
priority
=
nice_candidate_msn_priority
(
candidate
)
*
1000
;
}
else
{
candidate
->
priority
=
nice_candidate_ice_priority
(
candidate
);
}
priv_generate_candidate_credentials
(
agent
,
candidate
);
priv_assign_foundation
(
agent
,
candidate
);
priv_generate_candidate_credentials
(
agent
,
candidate
);
priv_assign_foundation
(
agent
,
candidate
);
/* note: candidate username and password are left NULL as stream
level ufrag/password are used */
if
(
nice_udp_socket_factory_make
(
&
agent
->
udp_socket_factory
,
udp_socket
,
address
))
{
gboolean
result
;
priv_attach_stream_component_socket
(
agent
,
stream
,
component
,
udp_socket
);
candidate
->
sockptr
=
udp_socket
;
candidate
->
addr
=
udp_socket
->
addr
;
candidate
->
base_addr
=
udp_socket
->
addr
;
result
=
priv_add_local_candidate_pruned
(
component
,
candidate
);
if
(
result
==
TRUE
)
{
GSList
*
modified_list
=
g_slist_append
(
component
->
sockets
,
udp_socket
);
if
(
modified_list
)
{
/* success: store a pointer to the sockaddr */
component
->
sockets
=
modified_list
;
agent_signal_new_candidate
(
agent
,
candidate
);
}
else
{
/* error: list memory allocation */
candidate
=
NULL
;
/* note: candidate already owned by component */
}
}
else
/* error: memory allocation, or duplicate candidatet */
errors
=
TRUE
;
udp_socket
=
nice_socket_new
(
agent
->
udp_socket_factory
,
address
);
if
(
udp_socket
)
{
gboolean
result
;
priv_attach_stream_component_socket
(
agent
,
stream
,
component
,
udp_socket
);
candidate
->
sockptr
=
udp_socket
;
candidate
->
addr
=
udp_socket
->
addr
;
candidate
->
base_addr
=
udp_socket
->
addr
;
result
=
priv_add_local_candidate_pruned
(
component
,
candidate
);
if
(
result
==
TRUE
)
{
GSList
*
modified_list
=
g_slist_append
(
component
->
sockets
,
udp_socket
);
if
(
modified_list
)
{
/* success: store a pointer to the sockaddr */
component
->
sockets
=
modified_list
;
agent_signal_new_candidate
(
agent
,
candidate
);
}
else
{
/* error: list memory allocation */
candidate
=
NULL
;
/* note: candidate already owned by component */
}
}
else
{
/* error: memory allocation, or duplicate candidates */
errors
=
TRUE
;
}
else
/* error: socket factory make */
errors
=
TRUE
;
}
else
/* error: udp socket memory allocation */
}
else
{
/* error: socket new */
errors
=
TRUE
;
}
}
/* clean up after errors */
...
...
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