Browse Source

core: set VLC_MALLOC on strings allocated by a memstream

After vlc_memstream_close() the memstream cannot be used anymore.
pull/162/head
Steve Lhomme 3 years ago
parent
commit
02b47bc2e4
  1. 2
      include/vlc_strings.h
  2. 4
      src/input/es_out.c
  3. 2
      src/input/stream_extractor.c
  4. 4
      src/input/vlmshell.c
  5. 2
      src/player/player.h
  6. 2
      src/text/url.c

2
include/vlc_strings.h

@ -223,7 +223,7 @@ VLC_API char *vlc_strftime( const char * );
* \return an allocated formatted string (must be free()'d), or NULL in case of error
*/
VLC_API char *vlc_strfplayer( vlc_player_t *player, input_item_t *item,
const char *fmt );
const char *fmt ) VLC_MALLOC;
static inline char *str_format( vlc_player_t *player, input_item_t *item,
const char *fmt )

4
src/input/es_out.c

@ -1991,8 +1991,8 @@ static void EsOutFillEsFmt(es_out_t *out, es_format_t *fmt)
}
}
static char *EsOutCreateStrId( es_out_id_t *es, bool stable, const char *id,
es_out_id_t *p_master )
VLC_MALLOC static char *EsOutCreateStrId( es_out_id_t *es, bool stable, const char *id,
es_out_id_t *p_master )
{
struct vlc_memstream ms;
if( vlc_memstream_open( &ms ) != 0 )

2
src/input/stream_extractor.c

@ -86,7 +86,7 @@ struct stream_extractor_private {
* within \p base, see \ref mrl_helpers for further information.
**/
static char*
VLC_MALLOC static char*
StreamExtractorCreateMRL( char const* base, char const* subentry )
{
struct vlc_memstream buffer;

4
src/input/vlmshell.c

@ -64,7 +64,7 @@ static vlm_message_t *vlm_Show( vlm_t *, vlm_media_sys_t *, vlm_schedule_sys_t *
static vlm_schedule_sys_t *vlm_ScheduleSearch( vlm_t *, const char * );
static char *Save( vlm_t * );
VLC_MALLOC static char *Save( vlm_t * );
static int Load( vlm_t *, char * );
static vlm_schedule_sys_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name );
@ -1573,7 +1573,7 @@ static int Load( vlm_t *vlm, char *file )
return 0;
}
static char *Save( vlm_t *vlm )
VLC_MALLOC static char *Save( vlm_t *vlm )
{
const char *psz_header = "\n"
"# VLC media player VLM command batch\n"

2
src/player/player.h

@ -434,7 +434,7 @@ vlc_player_input_SelectTracksByStringIds(struct vlc_player_input *input,
char *
vlc_player_input_GetSelectedTrackStringIds(struct vlc_player_input *input,
enum es_format_category_e cat);
enum es_format_category_e cat) VLC_MALLOC;
vlc_tick_t
vlc_player_input_GetTime(struct vlc_player_input *input);

2
src/text/url.c

@ -856,7 +856,7 @@ error:
return ret;
}
static char *vlc_uri_fixup_inner(const char *str, const char *extras)
VLC_MALLOC static char *vlc_uri_fixup_inner(const char *str, const char *extras)
{
assert(str && extras);

Loading…
Cancel
Save