From patchwork Thu Apr 13 02:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41125 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp903721pzb; Wed, 12 Apr 2023 19:11:42 -0700 (PDT) X-Google-Smtp-Source: AKy350aXbsI24SG1Zp5tAD+JIEe66eyLjQV0wBhc4GOs81JXiNQIAMRp7YATLHxGM4qrwX5aD7NE X-Received: by 2002:aa7:d303:0:b0:505:74d:d9e with SMTP id p3-20020aa7d303000000b00505074d0d9emr822865edq.16.1681351901726; Wed, 12 Apr 2023 19:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681351901; cv=none; d=google.com; s=arc-20160816; b=bsxaxP2TrBY6sFsoFmz4SdXKUdg8DioC6ZJoix6ijfTwAMnQXL57oOVeHXqLLslSGC jSmmFCzyP4feF7qNc6qdiIHX1IEgqMp28Q8KGFv96qDD1kMcF5kDjicGJHvHxxuPppcd XErzP3gffOtenvD6PNcYkJrhIjuA9LL5Ch0p8prJFgD5dDWG4BcQ1BOQTYKZMfBMJJTm hfdpKBLDBUwssCad4C8sbSzTJsINhvYtTMbONLoHESYqXGRC1HzzCIaCmJbattT65cQd 4JdZtEMWBny25nroi2wqrExSiwJvM7tmOXpM2u2LKMNn34bM9BMSwnvnJKwENSkcEkkJ H7mw== 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=VTM6kX4mpNE7KOtqhBAZn1ld26FITSU++aJb5Sdez2A=; b=MUcSxPWrwqJEvZsXQeWkgpkbvWxphtWSnOI9rApujLIpLqlN8VyRDkUOp2GF/VGUYH 8GZ08SbTRlpi4DeH3Xx9kT9N1AZGTwBeRDBt8+dw/RLUnLOOuoWS2hXAzYB4lu7H4Pvz SveDnRcUigFZ5mlSRfiZhGQZFitktFW/CzRKRKGTIea2yWcAZrzjZFaghsxZNeeII/WI WUkRfz2xFdpIXcNllJg+LL5mEUOUNYI8xGqS5vQxLzr+qWZkWIK6oYvA2I7+8ArjJGfD /R++l4wbNCJeiKucPAxkQRXhu0legVt51oZ3TiXaOdcfdBnwK3penKBpM23tRALghE9Q amgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=bxpWmnNX; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j17-20020aa7c411000000b005048548ab56si537033edq.247.2023.04.12.19.11.41; Wed, 12 Apr 2023 19:11:41 -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=@gmail.com header.s=20221208 header.b=bxpWmnNX; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CE1E68A279; Thu, 13 Apr 2023 05:11:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4D95680303 for ; Thu, 13 Apr 2023 05:11:31 +0300 (EEST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1879502e2afso4730fac.5 for ; Wed, 12 Apr 2023 19:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681351889; x=1683943889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uVuPO0yC+c/i8v04VSms1LPCONLiAOC6uKRyn1RIEjU=; b=bxpWmnNX3ak2ZrzQtFHLiiWRrfJYfUaCoesPJJDJBun/iRb8TOKFtIKSJMYSwda4Eu cIkAfR5qYpXuT/A8oquFxQWb8TV2pTsK/I1hztDgTvuprvf5MczqtPwyuWZiAHQQezEr Rk84VBoSYiJz0gb67a8T85oDVyc8T9teFz5rYdY8J+cLYoh0xGMLAGOP4njq2pe3Zixb Dpaos9l/p2pgzGFpJ2gXHr/E4vkPYR3NM5/7nz8zdMruSnifUoVnjoIftvK/2Q5g+skG vveLL6nfZasISeK8zCyT33cqNh/jto/3p8vHHY0j+TUEoBbP219BOGAywWMs3vb98fL7 DP+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681351889; x=1683943889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uVuPO0yC+c/i8v04VSms1LPCONLiAOC6uKRyn1RIEjU=; b=i6HsEPkYvS8iQ8fZwPbp6X/Qivz04zlTtra4o9JhhTJ2Kuyiu9tZWeiguooiy0z85u 3b8TPI77//d41B2u2OENPSyn45Ge4BrC4pEWsABiwbxolb6mnfUcbGYDb3dQ9iVwkEXx 7S8FgLJ/LqFvWgTHrw9NPmNIj/uIzoXatuL0McgLr1FUM/hPq/k3eCBQ/kxxaqBWdeIP cx8Ko3jd3xF4kPul/M9QL6ZGjXhjy2Echzlrri7iJrboRJMohCPE6j5Ja+doziw//jHO nAO3BXmkVGFThZaG/mzF/FGVa+aTkhO3UP3Jb5Zqt4CLajeDmBkvyqCY6ajELNWHFRYc hz/g== X-Gm-Message-State: AAQBX9dF5ikLOwWzttbezsvcciCbDrzPqPijE2vWIxDWiui7zu8ZHc/Z +gUfWq1DmUS4boE8SYgApa8kxIFm95c= X-Received: by 2002:a05:6870:9598:b0:186:906d:5b26 with SMTP id k24-20020a056870959800b00186906d5b26mr558817oao.14.1681351889700; Wed, 12 Apr 2023 19:11:29 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id dy16-20020a056870c79000b0017197629658sm253660oab.56.2023.04.12.19.11.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 19:11:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2023 23:11:06 -0300 Message-Id: <20230413021106.44992-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230413015356.44961-2-jamrial@gmail.com> References: <20230413015356.44961-2-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2 v2] avutil/wchar_filename: propagate MultiByteToWideChar() and WideCharToMultiByte() failures 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: dobcwa2mc21d Don't return success if the string could not be converted. Signed-off-by: James Almer --- libavutil/wchar_filename.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 9a04a069f1..fbc0a55146 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -32,7 +32,8 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0); if (num_chars <= 0) { *filename_w = NULL; - return 0; + errno = EINVAL; + return -1; } *filename_w = (wchar_t *)av_calloc(num_chars, sizeof(wchar_t)); if (!*filename_w) { @@ -52,7 +53,8 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, NULL, 0, NULL, NULL); if (num_chars <= 0) { *filename = NULL; - return 0; + errno = EINVAL; + return -1; } *filename = (char*)av_malloc_array(num_chars, sizeof *filename); if (!*filename) {