From patchwork Mon May 25 14:08:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19857 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A5B7144A859 for ; Mon, 25 May 2020 17:08:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 947F968A9F0; Mon, 25 May 2020 17:08:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28F14689AE3 for ; Mon, 25 May 2020 17:08:36 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id y5so131416wmj.4 for ; Mon, 25 May 2020 07:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+iCDwPHwtwrx6/+ohgu6Rh2t/Ghz+2MdAFhKyl1fD10=; b=usakIHj73VqU8ofDbFFY7U0PtnbKQeOCnwY/iZnKJ6oxb5MahVzOiVN23jn3HCQ1cm 6vlyNxr3+lO7u2ppY1zymD9H6NkdS3COvfspLIFdk+GzRNJ7khKeqZ4wBbsoq8ED07zt cRRhjKpPjwpBfEPKgO+kJZrW2F72MUejs3IG/B6kS8SMdHM+ufLTFptEFZ9ILI6d7UUN MYpD1PHA5oZnAXpn2vsuxIC5FlHzCY+GJEpqvxpctLskISLLoY1XkJmAFBIJP1NpCMUy 3a+K+h8U/z/0Rg3F7iNTrDqzMMT8N2X1Fcloi5YUP1SMlgeumctTer232McGCNeymMtk UJ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+iCDwPHwtwrx6/+ohgu6Rh2t/Ghz+2MdAFhKyl1fD10=; b=cl9Bg+MmVP+ef3maWaZ41HBWuNDjMZkvclNqFf2sP4Pe9ciljtNmCWPT5f2uJpkuWI Bfme3ay4GSthTWaQy3ZekQO9N2cCo+aZwcIJa+Zv0vOyWCGP/RQh5rs8oATKESB5aGpv K3F0WapXVynui2JVTw3BSo8qNM8l+GuzErXn8wuzKbuZPwKgXNBDWRdEvr8GtXyeOOCk i3iZTD3uQrTcmSnRkBlQ/RRTi7fTKczI+nFIEJY4h2FO6/ZWhJgTQe53uJJGzNXC10Ek xbtxo1gXk2iEGEOnB4MI1MFf2PAB7QzVodFqeCYQvqQRGYTOuRg4asgtOiNAc06P9ELE N6tA== X-Gm-Message-State: AOAM532rg4ZDeqn3hrSwSMG2okZ/D2K7ktuzruoHaaydPOdaKz6dM0g2 VMjYd6xuOXps17Rxlj8j3NTuU9Au X-Google-Smtp-Source: ABdhPJwHuTcMYue28b6qWVpEvnHHdUQ8cWNmQFASMQJZE9SKfGlr/go7K65c2zZQbzBgmliouu9UHg== X-Received: by 2002:a7b:c951:: with SMTP id i17mr23994097wml.63.1590415715169; Mon, 25 May 2020 07:08:35 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id x186sm10355218wmg.8.2020.05.25.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2020 07:08:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 16:08:00 +0200 Message-Id: <20200525140801.18889-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200525140801.18889-1-andreas.rheinhardt@gmail.com> References: <20200525140801.18889-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/aviobuf: Return better error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 688c7c50fd..a13c677875 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -696,7 +696,7 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size) int len; if (size < 0) - return -1; + return AVERROR(EINVAL); if (s->read_packet && s->write_flag) { len = read_packet_wrapper(s, buf, size); @@ -1277,7 +1277,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) /* reallocate buffer if needed */ new_size = (unsigned)d->pos + buf_size; if (new_size < d->pos || new_size > INT_MAX) - return -1; + return AVERROR(ERANGE); if (new_size > d->allocated_size) { unsigned new_allocated_size = d->allocated_size ? d->allocated_size : new_size; @@ -1324,8 +1324,10 @@ static int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence) offset += d->pos; else if (whence == SEEK_END) offset += d->size; - if (offset < 0 || offset > 0x7fffffffLL) - return -1; + if (offset < 0) + return AVERROR(EINVAL); + if (offset > INT_MAX) + return AVERROR(ERANGE); d->pos = offset; return 0; } @@ -1336,7 +1338,7 @@ static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size) unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; if (sizeof(DynBuffer) + io_buffer_size < io_buffer_size) - return -1; + return AVERROR(ERANGE); d = av_mallocz(sizeof(DynBuffer) + io_buffer_size); if (!d) return AVERROR(ENOMEM); @@ -1360,7 +1362,7 @@ int avio_open_dyn_buf(AVIOContext **s) int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) { if (max_packet_size <= 0) - return -1; + return AVERROR(EINVAL); return url_open_dyn_buf_internal(s, max_packet_size); }