[FFmpeg-devel] [PATCH] ffserver: Use av_malloc_array()

Reynaldo H. Verdejo Pinochet reynaldo at osg.samsung.com
Fri Jan 9 22:51:57 CET 2015


Loos good. Please push.

On 01/06/2015 02:13 PM, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  ffserver.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/ffserver.c b/ffserver.c
> index c4cf390..19d0b25 100644
> --- a/ffserver.c
> +++ b/ffserver.c
> @@ -2810,11 +2810,9 @@ static int prepare_sdp_description(FFServerStream *stream, uint8_t **pbuffer,
>          snprintf(avc->filename, 1024, "rtp://0.0.0.0");
>      }
>  
> -    if (avc->nb_streams >= INT_MAX/sizeof(*avc->streams) ||
> -        !(avc->streams = av_malloc(avc->nb_streams * sizeof(*avc->streams))))
> +    if (!(avc->streams = av_malloc_array(avc->nb_streams, sizeof(*avc->streams))))
>          goto sdp_done;
> -    if (avc->nb_streams >= INT_MAX/sizeof(*avs) ||
> -        !(avs = av_malloc(avc->nb_streams * sizeof(*avs))))
> +    if (!(avs = av_malloc_array(avc->nb_streams, sizeof(*avs))))
>          goto sdp_done;
>  
>      for(i = 0; i < stream->nb_streams; i++) {
> 

-- 
Reynaldo H. Verdejo Pinochet
Open Source Group
Samsung Research America / Silicon Valley


More information about the ffmpeg-devel mailing list