[vlc-devel] [PATCH 09/12] network: io: Remove VLA usages

Steve Lhomme robux4 at ycbcr.xyz
Tue Dec 8 16:20:37 CET 2020


On 2020-12-08 16:12, Rémi Denis-Courmont wrote:
> Callers don't expect errors here. Polling just has to work.
> 
> -1

yes, there are plenty of return -1, as seen in the patch.

> Le 8 décembre 2020 16:19:13 GMT+02:00, "Hugo Beauzée-Luyssen" 
> <hugo at beauzee.fr> a écrit :
> 
>     ------------------------------------------------------------------------
>       src/network/io.c | 7 ++++++-
>       1 file changed, 6 insertions(+), 1 deletion(-)
> 
>     diff --git a/src/network/io.c b/src/network/io.c
>     index 5285edc169..d4f15fe115 100644
>     --- a/src/network/io.c
>     +++ b/src/network/io.c
>     @@ -313,7 +313,9 @@ int net_Accept(vlc_object_t *obj, int *fds)
>           while (fds[n] != -1)
>               n++;
>       
>     -    struct pollfd ufd[n];
>     +    struct pollfd *ufd = malloc(n * sizeof((*ufd)));
>     +    if (!ufd)
>     +        return -1;
>           /* Initialize file descriptor set */
>           for (unsigned i = 0; i < n; i++)
>           {
>     @@ -328,6 +330,7 @@ int net_Accept(vlc_object_t *obj, int *fds)
>                   if (net_errno != EINTR)
>                   {
>                       msg_Err(obj, "poll error: %s", vlc_strerror_c(net_errno));
>     +                free(ufd);
>                       return -1;
>                   }
>               }
>     @@ -359,9 +362,11 @@ int net_Accept(vlc_object_t *obj, int *fds)
>                    */
>                   memmove(fds + i, fds + i + 1, n - (i + 1));
>                   fds[n - 1] = sfd;
>     +            free(ufd);
>                   return fd;
>               }
>           }
>     +    free(ufd);
>           return -1;
>       }
>       
> 
> 
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser 
> ma brièveté.
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
> 


More information about the vlc-devel mailing list