diff mbox series

[FFmpeg-devel,v4,2/3] avformat/udp: add memory alloc checks

Message ID 1610168848-17933-2-git-send-email-lance.lmwang@gmail.com
State Accepted
Headers show
Series [FFmpeg-devel,v4,1/3] avformat/udp: return the error code instead of generic EIO | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Lance Wang Jan. 9, 2021, 5:07 a.m. UTC 
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavformat/udp.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Marton Balint Jan. 13, 2021, 10:09 p.m. UTC | #1 
On Sat, 9 Jan 2021, lance.lmwang@gmail.com wrote:

> From: Limin Wang <lance.lmwang@gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
> libavformat/udp.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/libavformat/udp.c b/libavformat/udp.c
> index 088e30c..a7fbb94 100644
> --- a/libavformat/udp.c
> +++ b/libavformat/udp.c
> @@ -903,6 +903,10 @@ static int udp_open(URLContext *h, const char *uri, int flags)
>     if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) {
>         /* start the task going */
>         s->fifo = av_fifo_alloc(s->circular_buffer_size);
> +        if (!s->fifo) {
> +            ret = AVERROR(ENOMEM);
> +            goto fail;
> +        }
>         ret = pthread_mutex_init(&s->mutex, NULL);
>         if (ret != 0) {
>             av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));

LGTM, thanks.

Marton
diff mbox series

Patch

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 088e30c..a7fbb94 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -903,6 +903,10 @@  static int udp_open(URLContext *h, const char *uri, int flags)
     if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) {
         /* start the task going */
         s->fifo = av_fifo_alloc(s->circular_buffer_size);
+        if (!s->fifo) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
         ret = pthread_mutex_init(&s->mutex, NULL);
         if (ret != 0) {
             av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));