Skip to content

V
vlc-2-2
Commit 6783cf4c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

directory: use block_heap_Alloc()

parent 7942bdac
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
modules/access/directory.c
View file @ 6783cf4c
...@@ -244,14 +244,12 @@ block_t *DirBlock (access_t *p_access) ...@@ -244,14 +244,12 @@ block_t *DirBlock (access_t *p_access)
"%s" \ "%s" \
" </extension>\n" \ " </extension>\n" \
"</playlist>\n", p_sys->psz_xspf_extension ); "</playlist>\n", p_sys->psz_xspf_extension );
if( len < 0 ) if (unlikely(len == -1))
goto fatal; goto fatal;
block_t *block = block_Alloc ( len ); block_t *block = block_heap_Alloc (footer, footer, len);
if (!block) if (unlikely(block == NULL))
goto fatal; free (footer);
memcpy (block->p_buffer, footer, len);
free( footer );
p_access->info.b_eof = true; p_access->info.b_eof = true;
return block; return block;
} }
...@@ -393,15 +391,12 @@ block_t *DirBlock (access_t *p_access) ...@@ -393,15 +391,12 @@ block_t *DirBlock (access_t *p_access)
goto fatal; goto fatal;
free( old_xspf_extension ); free( old_xspf_extension );
/* TODO: new block allocator for malloc()ated data */ block_t *block = block_heap_Alloc (entry, entry, len);
block_t *block = block_Alloc (len); if (unlikely(block == NULL))
if (!block)
{ {
free (entry); free (entry);
goto fatal; goto fatal;
} }
memcpy (block->p_buffer, entry, len);
free (entry);
return block; return block;
fatal: fatal:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment