From patchwork Sat Dec 14 22:19:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16795 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 B93EB449C5F for ; Sun, 15 Dec 2019 00:33:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9975F689767; Sun, 15 Dec 2019 00:33:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F9AE688200 for ; Sun, 15 Dec 2019 00:33:18 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id q10so2724534wrm.11 for ; Sat, 14 Dec 2019 14:33:18 -0800 (PST) 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=7NwntWS/O+iWjSlQrnAiGmLDhujYTyeW29lkX9QHv9c=; b=gt00daBZekd5ITPfrp9XQr8/jfaifRklycg5c+T/SsLswcptjnlbqn1tlpLTssWFic NdYu1u+HaRmOTJe+6dK8pzQa5sR7tkhP2lrOx2Q9ThEv+xlXQN46X3H+GXTlYSMMZEfO PnStKt9rk02B91zAsi6mY1Ju/x+ypZG+vlrsa7qngkDW/gPCUf4jdZJ5UVfZCWb9G89E Z2zqUSFMNVpP0Imto+/7v7f/GO5Sisww4egw6fJZbLgrgPgrCbsmqL51FVrdddXGtaDV 1LhHMfTI3X0z+J8iJdtnmi/MKOjaavOtw+1ZEMFfBxx8bxXuuiQfVWdeXklCs0Iq+lVm VEqg== 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=7NwntWS/O+iWjSlQrnAiGmLDhujYTyeW29lkX9QHv9c=; b=KsOdJWN2pArIPPkqGTtClKwH4eQsH9V3XT82yREBADGDFgHP9rmxHvRS82RfSIpkH0 dNvTMqceObkbMrE5LTP8WZjVVRZ1NIumkXriDZ3U6sZ5emB7tOv76+p2fzH4w1FdJaE4 2ezbiHs8bF0rLYxpHeUyMn9zvW7nDZguYoYVUI8oV2ne70MTO6JzL0r0+xCB+AN9yY5C D6p/j0N0HUPKFXa7TzRLm1nzB+cueCeN/IrKE48u7WEmXpZmwOFEHm1qMU5SzrgehZQX CE5Xgr8XBG7hO8ncW+1JJEksMNy2/tIJ7R7giXeskPpoGhsPFg71BPMigscT4cUEdNYQ y6iA== X-Gm-Message-State: APjAAAXTnW2rfJnzNNX8Wfa14XxSIBhyb3/UjAnIFvcURLlVh42gsttC XAaHmmGPI0lfdBAma7VtfgpvLQot X-Google-Smtp-Source: APXvYqwYjXyq6TTAzJByhdnL+f4x92dPM0Yj3w2uu9teWWayihNaVW/3iMdpambS3NEMEWr1Bf1JUQ== X-Received: by 2002:a5d:690e:: with SMTP id t14mr20660671wru.65.1576362345996; Sat, 14 Dec 2019 14:25:45 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id v3sm15063771wml.47.2019.12.14.14.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2019 14:25:45 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Dec 2019 23:19:14 +0100 Message-Id: <20191214221926.16074-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191214221926.16074-1-andreas.rheinhardt@gmail.com> References: <20191214221926.16074-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/14] bytestream: Make get_bytes_left compatible with overread 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" bytestream2_get_bytes_left returns an unsigned int; as a result, it returns big positive numbers if an overread already happened, making it unsuitable for scenarios where one wants to allow this in a controlled way (because the buffer is actually padded so that no segfaults can happen). So change it to return an ordinary int. Also, bytestream2_get_bytes_left_p has been modified in the same way. Signed-off-by: Andreas Rheinhardt --- Implemented James' suggestion to return an int. I have not found a place where this would pose a problem. libavcodec/bytestream.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 7be7fc22fc..0516a6e3dc 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -151,12 +151,12 @@ static av_always_inline void bytestream2_init_writer(PutByteContext *p, p->eof = 0; } -static av_always_inline unsigned int bytestream2_get_bytes_left(GetByteContext *g) +static av_always_inline int bytestream2_get_bytes_left(GetByteContext *g) { return g->buffer_end - g->buffer; } -static av_always_inline unsigned int bytestream2_get_bytes_left_p(PutByteContext *p) +static av_always_inline int bytestream2_get_bytes_left_p(PutByteContext *p) { return p->buffer_end - p->buffer; }