| Message ID | bbdc6e9eb43844aea1923c0cf1fbae4a@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/v4l2_m2m: Check if the file descriptor is valid before closing | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
Wujian(Chin) <wujian2@huawei.com> 于2022年6月28日周二 19:15写道： > > Fixes ticket #9507. > > Signed-off-by: wujian_nanjing <wujian2@huawei.com> > --- > libavcodec/v4l2_m2m.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c > index 51932ba..9849360 100644 > --- a/libavcodec/v4l2_m2m.c > +++ b/libavcodec/v4l2_m2m.c > @@ -251,7 +251,8 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) > ff_v4l2_context_release(&s->capture); > sem_destroy(&s->refsync); > > - close(s->fd); > + if (s->fd >= 0) > + close(s->fd); > av_frame_unref(s->frame); > av_frame_free(&s->frame); > av_packet_unref(&s->buf_pkt); > -- > 2.7.4 > > _______________________________________________ > 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". Applied Thanks Steven
diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index 51932ba..9849360 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -251,7 +251,8 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) ff_v4l2_context_release(&s->capture); sem_destroy(&s->refsync); - close(s->fd); + if (s->fd >= 0) + close(s->fd); av_frame_unref(s->frame); av_frame_free(&s->frame); av_packet_unref(&s->buf_pkt);
Fixes ticket #9507. Signed-off-by: wujian_nanjing <wujian2@huawei.com> --- libavcodec/v4l2_m2m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)