[FFmpeg-cvslog] avformat/sdp: Check before appending ","
Michael Niedermayer
git at videolan.org
Thu Jun 13 23:42:08 EEST 2024
ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Wed May 8 04:07:40 2024 +0200| [f466265169957e61f29890550cea34b16d480dae] | committer: Michael Niedermayer
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 at niedermayer.cc>
(cherry picked from commit 5b82852519e92a2b94de0f22da1a81df5b3e0412)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f466265169957e61f29890550cea34b16d480dae
---
libavformat/sdp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 99a19852ff..5b1d22a301 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -201,6 +201,8 @@ static int extradata2psets(AVFormatContext *s, const AVCodecParameters *par,
continue;
}
if (p != (psets + strlen(pset_string))) {
+ if (p - psets >= MAX_PSET_SIZE)
+ goto fail_in_loop;
*p = ',';
p++;
}
@@ -211,6 +213,7 @@ static int extradata2psets(AVFormatContext *s, const 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);
More information about the ffmpeg-cvslog
mailing list