Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
videolan
vlc-2-2
Commits
2280a7d8
Commit
2280a7d8
authored
May 22, 2005
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix httpd reference count and deletion
parent
294f4f36
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
src/misc/httpd.c
src/misc/httpd.c
+7
-4
No files found.
src/misc/httpd.c
View file @
2280a7d8
...
@@ -1173,6 +1173,12 @@ socket_error:
...
@@ -1173,6 +1173,12 @@ socket_error:
return
host
;
return
host
;
error:
error:
if
(
httpd
->
i_host
<=
0
)
{
vlc_object_release
(
httpd
);
vlc_object_detach
(
httpd
);
vlc_object_destroy
(
httpd
);
}
vlc_mutex_unlock
(
lockval
.
p_address
);
vlc_mutex_unlock
(
lockval
.
p_address
);
if
(
fd
!=
-
1
)
if
(
fd
!=
-
1
)
...
@@ -1184,8 +1190,6 @@ error:
...
@@ -1184,8 +1190,6 @@ error:
vlc_object_destroy
(
host
);
vlc_object_destroy
(
host
);
}
}
/* TODO destroy no more used httpd TODO */
vlc_object_release
(
httpd
);
return
NULL
;
return
NULL
;
}
}
...
@@ -1201,8 +1205,6 @@ void httpd_HostDelete( httpd_host_t *host )
...
@@ -1201,8 +1205,6 @@ void httpd_HostDelete( httpd_host_t *host )
var_Get
(
httpd
->
p_libvlc
,
"httpd_mutex"
,
&
lockval
);
var_Get
(
httpd
->
p_libvlc
,
"httpd_mutex"
,
&
lockval
);
vlc_mutex_lock
(
lockval
.
p_address
);
vlc_mutex_lock
(
lockval
.
p_address
);
vlc_object_release
(
httpd
);
host
->
i_ref
--
;
host
->
i_ref
--
;
if
(
host
->
i_ref
>
0
)
if
(
host
->
i_ref
>
0
)
{
{
...
@@ -1244,6 +1246,7 @@ void httpd_HostDelete( httpd_host_t *host )
...
@@ -1244,6 +1246,7 @@ void httpd_HostDelete( httpd_host_t *host )
if
(
httpd
->
i_host
<=
0
)
if
(
httpd
->
i_host
<=
0
)
{
{
msg_Info
(
httpd
,
"httpd doesn't reference any host, deleting"
);
msg_Info
(
httpd
,
"httpd doesn't reference any host, deleting"
);
vlc_object_release
(
httpd
);
vlc_object_detach
(
httpd
);
vlc_object_detach
(
httpd
);
vlc_object_destroy
(
httpd
);
vlc_object_destroy
(
httpd
);
}
}
...
...
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