jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Don't call width/height funcs if context invalid

Browse Source 
Don't allow calling a source's custom get_width or get_height callbacks
unless the context is valid.  Fixes a bug where a null pointer could be
passed to those functions.
This commit is contained in:
jp9000 2018-09-13 06:52:33 -07:00
parent 272925049e
commit f1aa71bef1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/obs-source.c
View File

@ -1837,11 +1837,12 @@ void obs_source_video_render(obs_source_t *source)
static uint32_t get_base_width(const obs_source_t *source)
{
bool is_filter = !!source->filter_parent;
bool func_valid = source->context.data && source->info.get_width;
if (source->info.type == OBS_SOURCE_TYPE_TRANSITION) {
return source->enabled ? source->transition_actual_cx : 0;
} else if (source->info.get_width && (!is_filter || source->enabled)) {
} else if (func_valid && (!is_filter || source->enabled)) {
return source->info.get_width(source->context.data);
} else if (is_filter) {
@ -1854,11 +1855,12 @@ static uint32_t get_base_width(const obs_source_t *source)
static uint32_t get_base_height(const obs_source_t *source)
{
bool is_filter = !!source->filter_parent;
bool func_valid = source->context.data && source->info.get_height;
if (source->info.type == OBS_SOURCE_TYPE_TRANSITION) {
return source->enabled ? source->transition_actual_cy : 0;
} else if (source->info.get_height && (!is_filter || source->enabled)) {
} else if (func_valid && (!is_filter || source->enabled)) {
return source->info.get_height(source->context.data);
} else if (is_filter) {