Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cppdap
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
cppdap
Commits
1f7f4890
Commit
1f7f4890
authored
Nov 14, 2019
by
Ben Clayton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory leak in src/socket.cpp
parent
d13d4a41
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
socket.cpp
src/socket.cpp
+9
-7
No files found.
src/socket.cpp
View file @
1f7f4890
...
...
@@ -74,17 +74,19 @@ class dap::Socket::Shared : public dap::ReaderWriter {
if
(
info
)
{
auto
socket
=
::
socket
(
info
->
ai_family
,
info
->
ai_socktype
,
info
->
ai_protocol
);
return
std
::
make_shared
<
Shared
>
(
*
info
,
socket
);
return
std
::
make_shared
<
Shared
>
(
info
,
socket
);
}
freeaddrinfo
(
info
);
term
();
return
nullptr
;
}
Shared
(
SOCKET
socket
)
:
info
(
{}
),
sock
(
socket
)
{}
Shared
(
const
addrinfo
&
info
,
SOCKET
socket
)
:
info
(
info
),
sock
(
socket
)
{}
Shared
(
SOCKET
socket
)
:
info
(
nullptr
),
sock
(
socket
)
{}
Shared
(
addrinfo
*
info
,
SOCKET
socket
)
:
info
(
info
),
sock
(
socket
)
{}
~
Shared
()
{
freeaddrinfo
(
info
);
close
();
term
();
}
...
...
@@ -141,7 +143,7 @@ class dap::Socket::Shared : public dap::ReaderWriter {
static_cast
<
int
>
(
bytes
),
0
)
>
0
;
}
const
addrinfo
info
;
addrinfo
*
const
info
;
private
:
std
::
atomic
<
SOCKET
>
sock
=
{
InvalidSocket
};
...
...
@@ -156,7 +158,7 @@ Socket::Socket(const char* address, const char* port)
}
auto
socket
=
shared
->
socket
();
if
(
bind
(
socket
,
shared
->
info
.
ai_addr
,
(
int
)
shared
->
info
.
ai_addrlen
)
!=
0
)
{
if
(
bind
(
socket
,
shared
->
info
->
ai_addr
,
(
int
)
shared
->
info
->
ai_addrlen
)
!=
0
)
{
shared
.
reset
();
return
;
}
...
...
@@ -194,8 +196,8 @@ void Socket::close() const {
std
::
shared_ptr
<
ReaderWriter
>
Socket
::
connect
(
const
char
*
address
,
const
char
*
port
)
{
auto
shared
=
Shared
::
create
(
address
,
port
);
if
(
::
connect
(
shared
->
socket
(),
shared
->
info
.
ai_addr
,
(
int
)
shared
->
info
.
ai_addrlen
)
==
0
)
{
if
(
::
connect
(
shared
->
socket
(),
shared
->
info
->
ai_addr
,
(
int
)
shared
->
info
->
ai_addrlen
)
==
0
)
{
return
shared
;
}
return
{};
...
...
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