From patchwork Sun Jun 30 23:12:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50234 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1460258vqv; Sun, 30 Jun 2024 16:14:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/5I7qmSQWfDSN5cLuvLFOVzQw62bzSGuklE1bODwXa+lKm3LiHNtjDk3CjuaWZ7ZwXKgcb744vImVNqXNeVuL77+UUUtJfuvfsw== X-Google-Smtp-Source: AGHT+IH6xko8lfO5KtJYBU/4k0nUoGwwDG7tjjYjEtGYX4Q0ZEH7V7aNFcIAsfcEpZaSZUd4rOUa X-Received: by 2002:a17:906:130c:b0:a6e:f997:7d91 with SMTP id a640c23a62f3a-a7514498aa7mr255619266b.38.1719789267782; Sun, 30 Jun 2024 16:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789267; cv=none; d=google.com; s=arc-20160816; b=JRAyCwIO84CMNZ00BKdNBM+i7zHBF3NK+eYbsqVMEcqOmz6uPMy8LP/X0yiFwhJ6yC ovlVg6I5TozJ9coB8sSCnmP2NPMnYW25IlFXBH+kABkUFL2lx7rgcVPzXBuwfQuBUPeN RMsT6ccPhmNpxVCBKte0l2GTozSulbmusrw2Itt0M/+bAbksxjwR4D8EHx+AYSAaU/Cd yyA2/Y9sNLZ2yaWDqwHWrdO9Pg8cNXVOStOjgR1h4/yvAPvNuZ9founz1OiJLNfUlzpy +7pBBhNsClso2tEL9tTzPCd49yntqTCw4H/WD5F38lLXbKTfo9JMnXg+zGd7C3QAQUh4 DKXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=HjDpDwEQtewQeCYSD3vYUcwD3O2JRrncojw1JrmtABc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=0OSpdDtim+C7dy0+s7C18kZ86/oUamJy7aefMGN2sF1jVAe493qNYdG98AGe9BGc5p NQTwbAL6lqFJTlrMSLYJ2dvAT8UxETlGd4LyWoB0dPEKr+HzGJy+MWIsg2XiLYWizvkK fiMUxkE0Uz2E+TGCOE34zyqwPCPPUZBAg7AKTCz00nRMs5fSJwzn83FOTzOjll/Hsjgn VR4YJ7AivM/adSnnEgTi9JnPriBNwgRbXePaJBa0q83xuV1U1QG0bGM/3sxOyQA/sKLX ueb4SeyxJbTH3YgWnDMBTRNF+zWVqR1/SSuli3Tzty2hEv0iJPMfABjAWMLgGK+sC5Jt msUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I7vARJwq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ab07427csi293908066b.493.2024.06.30.16.14.27; Sun, 30 Jun 2024 16:14:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I7vARJwq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E13F868D72C; Mon, 1 Jul 2024 02:13:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B47B68D6C3 for ; Mon, 1 Jul 2024 02:13:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9658B20003 for ; Sun, 30 Jun 2024 23:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H+D0dMe9ytpr/veOVsNyk4uwf+llvcM57ulKkcFP5ek=; b=I7vARJwqzRvEOgfpbW0JHf28Q0kuoyxNBHKeHLcdae86M9U9CMqMBHJGgn6BrmfmJlATBS HrLwifAkfcGHVRp8KVapGx/9skECAcuclejg0oNLD5hHx1PjyzkT6N0IlmcRJpnzOgdzxx yu38aWlN89u3gIbbynQjLU7DH4vFiNFpJixpApawK0niHaVdkCGG2coRwSwkN5nHdDIMQI GU4UURBponH4c+iWXhWxxNJPshJbqmFeGLaLnuM6UzzMRRIvf6r5C91jWt7uqjVhYYvueP r7y0wNXd+0gIGS6TlgaJoirY5G/OJAOW15EJRWAVr0XEYNLdJQ0kglWtgUtuXA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:47 +0200 Message-ID: <20240630231306.3779027-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 08/11] fftools/ffmpeg: Check read() for failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BmJ8YV/veDaO Fixes: CID1591932 Ignoring number of bytes read Untested, this needs a windows machine Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- fftools/ffmpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 88ce3007e83..8674c4d2506 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -285,8 +285,9 @@ static int read_key(void) } //Read it if(nchars != 0) { - read(0, &ch, 1); - return ch; + if (read(0, &ch, 1) == 1) + return ch; + return 0; }else{ return -1; }