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
346672b0
Commit
346672b0
authored
Jan 13, 2010
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly free memory in pseudotcp, and do it in finalize, not in dispose
parent
7e7cf461
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
10 deletions
+22
-10
agent/agent.c
agent/agent.c
+4
-4
agent/pseudotcp.c
agent/pseudotcp.c
+18
-6
No files found.
agent/agent.c
View file @
346672b0
...
...
@@ -915,15 +915,15 @@ static void priv_destroy_component_tcp (Component *component)
g_source_unref
(
component
->
tcp_clock
);
component
->
tcp_clock
=
NULL
;
}
if
(
component
->
tcp_data
!=
NULL
)
{
g_slice_free
(
TcpUserData
,
component
->
tcp_data
);
component
->
tcp_data
=
NULL
;
}
if
(
component
->
tcp
)
{
pseudo_tcp_socket_close
(
component
->
tcp
,
TRUE
);
g_object_unref
(
component
->
tcp
);
component
->
tcp
=
NULL
;
}
if
(
component
->
tcp_data
!=
NULL
)
{
g_slice_free
(
TcpUserData
,
component
->
tcp_data
);
component
->
tcp_data
=
NULL
;
}
}
static
void
priv_pseudo_tcp_error
(
NiceAgent
*
agent
,
Stream
*
stream
,
...
...
agent/pseudotcp.c
View file @
346672b0
...
...
@@ -340,7 +340,7 @@ static void pseudo_tcp_socket_get_property (GObject *object, guint property_id,
GValue
*
value
,
GParamSpec
*
pspec
);
static
void
pseudo_tcp_socket_set_property
(
GObject
*
object
,
guint
property_id
,
const
GValue
*
value
,
GParamSpec
*
pspec
);
static
void
pseudo_tcp_socket_
dispos
e
(
GObject
*
object
);
static
void
pseudo_tcp_socket_
finaliz
e
(
GObject
*
object
);
static
guint32
queue
(
PseudoTcpSocket
*
self
,
const
gchar
*
data
,
...
...
@@ -364,7 +364,7 @@ pseudo_tcp_socket_class_init (PseudoTcpSocketClass *cls)
object_class
->
get_property
=
pseudo_tcp_socket_get_property
;
object_class
->
set_property
=
pseudo_tcp_socket_set_property
;
object_class
->
dispose
=
pseudo_tcp_socket_dispos
e
;
object_class
->
finalize
=
pseudo_tcp_socket_finaliz
e
;
g_object_class_install_property
(
object_class
,
PROP_CONVERSATION
,
g_param_spec_uint
(
"conversation"
,
"TCP Conversation ID"
,
...
...
@@ -435,21 +435,33 @@ pseudo_tcp_socket_set_property (GObject *object,
}
static
void
pseudo_tcp_socket_
dispos
e
(
GObject
*
object
)
pseudo_tcp_socket_
finaliz
e
(
GObject
*
object
)
{
PseudoTcpSocket
*
self
=
PSEUDO_TCP_SOCKET
(
object
);
PseudoTcpSocketPrivate
*
priv
=
self
->
priv
;
GList
*
i
;
if
(
priv
==
NULL
)
return
;
/*TODO: free slist/rlist/?*/
for
(
i
=
priv
->
slist
;
i
;
i
=
i
->
next
)
{
SSegment
*
sseg
=
i
->
data
;
g_slice_free
(
SSegment
,
sseg
);
}
for
(
i
=
priv
->
rlist
;
i
;
i
=
i
->
next
)
{
RSegment
*
rseg
=
i
->
data
;
g_slice_free
(
RSegment
,
rseg
);
}
g_list_free
(
priv
->
slist
);
priv
->
slist
=
NULL
;
g_list_free
(
priv
->
rlist
);
priv
->
rlist
=
NULL
;
g_free
(
priv
);
self
->
priv
=
NULL
;
if
(
G_OBJECT_CLASS
(
pseudo_tcp_socket_parent_class
)
->
dispos
e
)
G_OBJECT_CLASS
(
pseudo_tcp_socket_parent_class
)
->
dispos
e
(
object
);
if
(
G_OBJECT_CLASS
(
pseudo_tcp_socket_parent_class
)
->
finaliz
e
)
G_OBJECT_CLASS
(
pseudo_tcp_socket_parent_class
)
->
finaliz
e
(
object
);
}
...
...
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