RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/format: Fix registering a format more than once and related races 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-04-07 17:26:56 +02:00
parent a887fbb582
commit 4cc896ea5f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/format.c
View File

@ -62,20 +62,24 @@ void av_register_input_format(AVInputFormat *format)
{ {
AVInputFormat **p = last_iformat; AVInputFormat **p = last_iformat;
format->next = NULL; // Note, format could be added after the first 2 checks but that implies that *p is no longer NULL
while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format)) while(p != &format->next && !format->next && avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
p = &(*p)->next; p = &(*p)->next;
last_iformat = &format->next;
if (!format->next)
last_iformat = &format->next;
} }
void av_register_output_format(AVOutputFormat *format) void av_register_output_format(AVOutputFormat *format)
{ {
AVOutputFormat **p = last_oformat; AVOutputFormat **p = last_oformat;
format->next = NULL; // Note, format could be added after the first 2 checks but that implies that *p is no longer NULL
while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format)) while(p != &format->next && !format->next && avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
p = &(*p)->next; p = &(*p)->next;
last_oformat = &format->next;
if (!format->next)
last_oformat = &format->next;
} }
int av_match_ext(const char *filename, const char *extensions) int av_match_ext(const char *filename, const char *extensions)