videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-03 01:31:53 +02:00
Code Releases Activity

input: readdir_helper: don't apply options on the current object

Browse Source
This commit is contained in:
Thomas Guillem 2017-10-12 10:41:44 +02:00
parent 1532b7f579
commit 6c87f60107
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/item.c
View File

@ -1670,8 +1670,15 @@ void vlc_readdir_helper_init(struct vlc_readdir_helper *p_rdh,
vlc_object_t *p_obj, input_item_node_t *p_node) vlc_object_t *p_obj, input_item_node_t *p_node)
{ {
/* Read options from the parent item. This allows vlc_stream_ReadDir() /* Read options from the parent item. This allows vlc_stream_ReadDir()
* users to specify options whitout touching any vlc_object_t. */ * users to specify options whitout touhing any vlc_object_t. Apply options
input_item_ApplyOptions(p_obj, p_node->p_item); * on a temporary object in order to not apply options (that can be
* insecure) to the current object. */
vlc_object_t *p_var_obj = vlc_object_create(p_obj, sizeof(vlc_object_t));
if (p_var_obj != NULL)
{
input_item_ApplyOptions(p_var_obj, p_node->p_item);
p_obj = p_var_obj;
}
p_rdh->p_node = p_node; p_rdh->p_node = p_node;
p_rdh->b_show_hiddenfiles = var_InheritBool(p_obj, "show-hiddenfiles"); p_rdh->b_show_hiddenfiles = var_InheritBool(p_obj, "show-hiddenfiles");
@ -1681,6 +1688,9 @@ void vlc_readdir_helper_init(struct vlc_readdir_helper *p_rdh,
var_InheritInteger(p_obj, "sub-autodetect-fuzzy"); var_InheritInteger(p_obj, "sub-autodetect-fuzzy");
TAB_INIT(p_rdh->i_slaves, p_rdh->pp_slaves); TAB_INIT(p_rdh->i_slaves, p_rdh->pp_slaves);
TAB_INIT(p_rdh->i_dirs, p_rdh->pp_dirs); TAB_INIT(p_rdh->i_dirs, p_rdh->pp_dirs);
if (p_var_obj != NULL)
vlc_object_release(p_var_obj);
} }
void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success) void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success)