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
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
15fcc695
Commit
15fcc695
authored
Oct 16, 2017
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some memory leaks.
parent
894391c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
11 deletions
+16
-11
src/chat/chat-message/chat-message-p.h
src/chat/chat-message/chat-message-p.h
+6
-6
src/chat/chat-message/chat-message.cpp
src/chat/chat-message/chat-message.cpp
+4
-1
src/chat/notification/is-composing.cpp
src/chat/notification/is-composing.cpp
+6
-3
src/conference/local-conference-event-handler.cpp
src/conference/local-conference-event-handler.cpp
+0
-1
No files found.
src/chat/chat-message/chat-message-p.h
View file @
15fcc695
...
...
@@ -136,11 +136,11 @@ private:
std
::
list
<
Content
>
contents
;
Content
internalContent
;
std
::
unordered_map
<
std
::
string
,
std
::
string
>
customHeaders
;
mutable
LinphoneErrorInfo
*
errorInfo
=
NULL
;
belle_http_request_t
*
httpRequest
=
NULL
;
belle_http_request_listener_t
*
httpListener
=
NULL
;
SalOp
*
salOp
=
NULL
;
SalCustomHeader
*
salCustomHeaders
=
NULL
;
mutable
LinphoneErrorInfo
*
errorInfo
=
nullptr
;
belle_http_request_t
*
httpRequest
=
nullptr
;
belle_http_request_listener_t
*
httpListener
=
nullptr
;
SalOp
*
salOp
=
nullptr
;
SalCustomHeader
*
salCustomHeaders
=
nullptr
;
unsigned
long
backgroundTaskId
;
unsigned
char
currentSendStep
=
Step
::
None
;
bool
applyModifiers
=
true
;
...
...
@@ -148,7 +148,7 @@ private:
ContentType
cContentType
;
std
::
string
cText
;
// Used for compatibility with previous C API
LinphoneContent
*
cFileTransferInformation
=
NULL
;
LinphoneContent
*
cFileTransferInformation
=
nullptr
;
// -----------------------------------------------------------------------------
...
...
src/chat/chat-message/chat-message.cpp
View file @
15fcc695
...
...
@@ -51,7 +51,10 @@ ChatMessagePrivate::ChatMessagePrivate (const shared_ptr<ChatRoom> &room)
:
chatRoom
(
room
)
{
}
ChatMessagePrivate
::~
ChatMessagePrivate
()
{}
ChatMessagePrivate
::~
ChatMessagePrivate
()
{
if
(
salOp
)
salOp
->
release
();
}
// -----------------------------------------------------------------------------
...
...
src/chat/notification/is-composing.cpp
View file @
15fcc695
...
...
@@ -266,9 +266,12 @@ void IsComposing::stopAllRemoteRefreshTimers () {
}
unordered_map
<
string
,
belle_sip_source_t
*>::
iterator
IsComposing
::
stopRemoteRefreshTimer
(
const
unordered_map
<
string
,
belle_sip_source_t
*>::
const_iterator
it
)
{
if
(
core
&&
core
->
sal
)
core
->
sal
->
cancel_timer
(
it
->
second
);
belle_sip_object_unref
(
it
->
second
);
belle_sip_source_t
*
timer
=
it
->
second
;
if
(
core
&&
core
->
sal
)
{
core
->
sal
->
cancel_timer
(
timer
);
delete
reinterpret_cast
<
IsRemoteComposingData
*>
(
belle_sip_source_get_user_data
(
timer
));
}
belle_sip_object_unref
(
timer
);
return
remoteRefreshTimers
.
erase
(
it
);
}
...
...
src/conference/local-conference-event-handler.cpp
View file @
15fcc695
...
...
@@ -39,7 +39,6 @@ static void doNotify (const string ¬ify, LinphoneEvent *lev) {
linphone_content_set_buffer
(
content
,
notify
.
c_str
(),
strlen
(
notify
.
c_str
()));
linphone_event_notify
(
lev
,
content
);
linphone_content_unref
(
content
);
linphone_event_unref
(
lev
);
}
// -----------------------------------------------------------------------------
...
...
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