mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/sdp: Check before appending ","
Found by reviewing code related to CID1500301 String not null terminated
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5b82852519
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
b06c0e8b83
commit
5b392f4983
|
@ -195,6 +195,8 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par)
|
|||
continue;
|
||||
}
|
||||
if (p != (psets + strlen(pset_string))) {
|
||||
if (p - psets >= MAX_PSET_SIZE)
|
||||
goto fail_in_loop;
|
||||
*p = ',';
|
||||
p++;
|
||||
}
|
||||
|
@ -204,6 +206,7 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par)
|
|||
}
|
||||
if (!av_base64_encode(p, MAX_PSET_SIZE - (p - psets), r, r1 - r)) {
|
||||
av_log(s, AV_LOG_ERROR, "Cannot Base64-encode %"PTRDIFF_SPECIFIER" %"PTRDIFF_SPECIFIER"!\n", MAX_PSET_SIZE - (p - psets), r1 - r);
|
||||
fail_in_loop:
|
||||
av_free(psets);
|
||||
av_free(tmpbuf);
|
||||
|
||||
|
|
Loading…
Reference in New Issue