* [FFmpeg-devel] [PATCH] lavu/fifo: fix regression
@ 2022-02-08 5:47 Xiang, Haihao
2022-02-08 17:48 ` Eoff, Ullysses A
0 siblings, 1 reply; 3+ messages in thread
From: Xiang, Haihao @ 2022-02-08 5:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
offset_w might be updated after growing the FIFO
Fix ticket #9630
Tested-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
Reviewed-by: mkver
Reviewed-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavutil/fifo.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 0af0154945..02e0ec3f0d 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -147,13 +147,15 @@ static int fifo_write_common(AVFifo *f, const uint8_t *buf, size_t *nb_elems,
AVFifoCB read_cb, void *opaque)
{
size_t to_write = *nb_elems;
- size_t offset_w = f->offset_w;
+ size_t offset_w;
int ret = 0;
ret = fifo_check_space(f, to_write);
if (ret < 0)
return ret;
+ offset_w = f->offset_w;
+
while (to_write > 0) {
size_t len = FFMIN(f->nb_elems - offset_w, to_write);
uint8_t *wptr = f->buffer + offset_w * f->elem_size;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavu/fifo: fix regression
2022-02-08 5:47 [FFmpeg-devel] [PATCH] lavu/fifo: fix regression Xiang, Haihao
@ 2022-02-08 17:48 ` Eoff, Ullysses A
2022-02-09 3:38 ` Xiang, Haihao
0 siblings, 1 reply; 3+ messages in thread
From: Eoff, Ullysses A @ 2022-02-08 17:48 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Xiang, Haihao
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Xiang, Haihao
> Sent: Monday, February 7, 2022 9:48 PM
> To: ffmpeg-devel@ffmpeg.org
> Cc: Xiang, Haihao <haihao.xiang@intel.com>
> Subject: [FFmpeg-devel] [PATCH] lavu/fifo: fix regression
>
> From: Haihao Xiang <haihao.xiang@intel.com>
>
> offset_w might be updated after growing the FIFO
>
> Fix ticket #9630
>
> Tested-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
> Reviewed-by: mkver
> Reviewed-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> libavutil/fifo.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libavutil/fifo.c b/libavutil/fifo.c
> index 0af0154945..02e0ec3f0d 100644
> --- a/libavutil/fifo.c
> +++ b/libavutil/fifo.c
> @@ -147,13 +147,15 @@ static int fifo_write_common(AVFifo *f, const uint8_t *buf, size_t *nb_elems,
> AVFifoCB read_cb, void *opaque)
> {
> size_t to_write = *nb_elems;
> - size_t offset_w = f->offset_w;
> + size_t offset_w;
> int ret = 0;
>
> ret = fifo_check_space(f, to_write);
> if (ret < 0)
> return ret;
>
> + offset_w = f->offset_w;
> +
> while (to_write > 0) {
> size_t len = FFMIN(f->nb_elems - offset_w, to_write);
> uint8_t *wptr = f->buffer + offset_w * f->elem_size;
> --
> 2.17.1
>
LGTM
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavu/fifo: fix regression
2022-02-08 17:48 ` Eoff, Ullysses A
@ 2022-02-09 3:38 ` Xiang, Haihao
0 siblings, 0 replies; 3+ messages in thread
From: Xiang, Haihao @ 2022-02-09 3:38 UTC (permalink / raw)
To: ffmpeg-devel, Eoff, Ullysses A
On Tue, 2022-02-08 at 17:48 +0000, Eoff, Ullysses A wrote:
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Xiang,
> > Haihao
> > Sent: Monday, February 7, 2022 9:48 PM
> > To: ffmpeg-devel@ffmpeg.org
> > Cc: Xiang, Haihao <haihao.xiang@intel.com>
> > Subject: [FFmpeg-devel] [PATCH] lavu/fifo: fix regression
> >
> > From: Haihao Xiang <haihao.xiang@intel.com>
> >
> > offset_w might be updated after growing the FIFO
> >
> > Fix ticket #9630
> >
> > Tested-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
> > Reviewed-by: mkver
> > Reviewed-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
> > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> > ---
> > libavutil/fifo.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavutil/fifo.c b/libavutil/fifo.c
> > index 0af0154945..02e0ec3f0d 100644
> > --- a/libavutil/fifo.c
> > +++ b/libavutil/fifo.c
> > @@ -147,13 +147,15 @@ static int fifo_write_common(AVFifo *f, const uint8_t
> > *buf, size_t *nb_elems,
> > AVFifoCB read_cb, void *opaque)
> > {
> > size_t to_write = *nb_elems;
> > - size_t offset_w = f->offset_w;
> > + size_t offset_w;
> > int ret = 0;
> >
> > ret = fifo_check_space(f, to_write);
> > if (ret < 0)
> > return ret;
> >
> > + offset_w = f->offset_w;
> > +
> > while (to_write > 0) {
> > size_t len = FFMIN(f->nb_elems - offset_w, to_write);
> > uint8_t *wptr = f->buffer + offset_w * f->elem_size;
> > --
> > 2.17.1
> >
>
> LGTM
>
Applied, thx
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-09 3:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-08 5:47 [FFmpeg-devel] [PATCH] lavu/fifo: fix regression Xiang, Haihao
2022-02-08 17:48 ` Eoff, Ullysses A
2022-02-09 3:38 ` Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git