Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
fc5b6ff9
Commit
fc5b6ff9
authored
Jul 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remoteosd: close connection immediately if picture allocation fails
parent
f332147f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
9 deletions
+12
-9
modules/video_filter/remoteosd.c
modules/video_filter/remoteosd.c
+12
-9
No files found.
modules/video_filter/remoteosd.c
View file @
fc5b6ff9
...
@@ -587,14 +587,19 @@ static void* vnc_worker_thread( void *obj )
...
@@ -587,14 +587,19 @@ static void* vnc_worker_thread( void *obj )
}
}
/* Create an empty picture for VNC the data */
/* Create an empty picture for VNC the data */
vlc_mutex_lock
(
&
p_sys
->
lock
);
picture_t
*
pic
=
picture_New
(
VLC_CODEC_YUVA
,
p_sys
->
i_vnc_width
,
p_sys
->
i_socket
=
fd
;
p_sys
->
i_vnc_height
,
1
,
1
);
p_sys
->
p_pic
=
picture_New
(
VLC_CODEC_YUVA
,
if
(
likely
(
pic
!=
NULL
)
)
p_sys
->
i_vnc_width
,
p_sys
->
i_vnc_height
,
1
,
1
);
{
vlc_mutex_unlock
(
&
p_sys
->
lock
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
if
(
!
p_sys
->
p_pic
)
p_sys
->
i_socket
=
fd
;
p_sys
->
p_pic
=
pic
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
}
else
{
{
goto
exit
;
net_Close
(
fd
);
return
NULL
;
}
}
write_update_request
(
p_filter
,
false
);
write_update_request
(
p_filter
,
false
);
...
@@ -671,8 +676,6 @@ static void* vnc_worker_thread( void *obj )
...
@@ -671,8 +676,6 @@ static void* vnc_worker_thread( void *obj )
vlc_join
(
update_request_thread_handle
,
NULL
);
vlc_join
(
update_request_thread_handle
,
NULL
);
}
}
exit:
msg_Dbg
(
p_filter
,
"VNC message reader thread ended"
);
msg_Dbg
(
p_filter
,
"VNC message reader thread ended"
);
vlc_restorecancel
(
canc
);
vlc_restorecancel
(
canc
);
return
NULL
;
return
NULL
;
...
...
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