From patchwork Mon May 25 14:07:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19854 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 79B2A44A859 for ; Mon, 25 May 2020 17:08:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A65E68A0D1; Mon, 25 May 2020 17:08:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 143D8687F64 for ; Mon, 25 May 2020 17:08:12 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id r9so132331wmh.2 for ; Mon, 25 May 2020 07:08:11 -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:mime-version :content-transfer-encoding; bh=E63Zgff57PI0e5sEDr6ql787MQgetNc5IjJOB+5dhIo=; b=E2/jjZ9W52ADVhRBFJZDLNK7z7FQqVvtjhFviwb7EQb8OGTumOFh281eYXC5DueGqn 2aMO6FwnrhzoOauQd3EUTihxmsFvaDbgADgwlW6MDqptrLjoLwJcaH+o2GFmJc3X77zN VK8istCJW6yq56SWbYktNhANER/UI5GmIkxD03XkFIYfXhLz5gBIRoGbqVpCqG7mf4o9 VNw1Ot6fjTRijdoBe1KaYu3QjkTyRQaVt69hAulm9XmNA1tbT+sdT4WheedZlWw2Mfpq VvGKKU6uFD0K96J/wNHwPhTGW//BJMVpcG01oV8m6kwUQsW1QSmQJsXjtUJvMm6sm6qM K7ig== 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:mime-version :content-transfer-encoding; bh=E63Zgff57PI0e5sEDr6ql787MQgetNc5IjJOB+5dhIo=; b=jgQldah9J3LbEwvphNXWQm/3eZBm7I7aD+lg5PNsR4UFsTDnRYt7Cgu896l1ULq+EZ swoabjttI8/9I+3jnR4bAI5IYMXfvO3n6aO9/on4lY9yekDJS1Ar7sCRTTlco2tWXSo6 dDVQW0m+J8ejlJPfflj4+e8xUINkLHPWdFPeGbH1mTJmtu586eBymV/28BaQWRFxxthe 5DbQIw1W3+E0aNxHSXkPNnY2JC9qHOWpUynNr4VL8IBSSoTe2eBJyqUOS6+eFtichpZ6 UaH2Qc51l5zcWSOUZ/pq/wggwJHf5PDQ8o0sWVVDgiLmfip8u9BkeF8bcFHkWdxgSRQT XFAQ== X-Gm-Message-State: AOAM5337zOjmaCdiscSXHegXxmbZEsGr+i5iQ2LIagqu39Ui1lyLZWqg 9oPheShjW4uvErl+BiWScvfsU/6z X-Google-Smtp-Source: ABdhPJxShixMCVPHIo+DxSZCq8CP+xS4BluTzYb7zgs9tpWjLDNxL+Ude+WGtPSaS45GJAC5zIRaIw== X-Received: by 2002:a05:600c:2dd7:: with SMTP id e23mr24715542wmh.96.1590415691143; Mon, 25 May 2020 07:08:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2020 07:08:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 16:07:57 +0200 Message-Id: <20200525140801.18889-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/aviobuf: Don't check for overflow after it happened 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" If adding two ints overflows, it doesn't matter whether the result will be stored in an unsigned or not; and checking afterwards does not make it retroactively defined. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index eb0387bdf7..33c2d6f037 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1275,7 +1275,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) unsigned new_size, new_allocated_size; /* reallocate buffer if needed */ - new_size = d->pos + buf_size; + new_size = (unsigned)d->pos + buf_size; new_allocated_size = d->allocated_size; if (new_size < d->pos || new_size > INT_MAX/2) return -1;