From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1FEF74CA6D for ; Mon, 29 Dec 2025 16:23:50 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Lby/XJ+zvtgWdOSxIGKUbxSfF/57HryVacmfuYm49U4=', expected b'KALrxOZjSGmy/tnVLCivnJQwskDzOrU8C8/GqEawXaI=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767025423; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Lby/XJ+zvtgWdOSxIGKUbxSfF/57HryVacmfuYm49U4=; b=C5zVno4aDr+Qe7APbj1lqdvylZP3g7+8B5xTU9umOZ9bY4Fvo+tAkuNR4lw0j+Z/ZqDLW LGZ7olwwlUR5sEJmDUCgu1S/8J/eLnJosf4XI5pxfItF5c4qiHQIMD8U3PHeWwxz44MrbjD UuQvfZXo/8v7FTjQZERtYelTt+9BOb5rsoyk3Vw2WJfEBWenRcWHLCUR9xeOLKUX+zBdtA6 tLnejyEO9yxYrBZfTJDNcZUorQBM4pH4xODQt0TwylubQmN4SaYampUrH1ldivU+mmSvfk6 7ncFaLVdYuz4PCu3ei2uqffodwnnl1Y7etNhaqkFhDCI5gB34d9MDhjZN6EA== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 477C9690C8D; Mon, 29 Dec 2025 18:23:43 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767025410; b=RRWiCd6CNXOc51HdlSFdHEUiwlGd9dHigUHJ7IeGkMzmB9CHVal5FP/hm2fZ5YV8OiUSq yiOwnM5pP28+Jquos7Yjkpf7UdjPvyUuYjHFPfW/2MiikzkCU4IrAs9S94zyy0y0q9NGdXU ZMFpZm0Wa+hfCUVXCKzvU7Rk4rx1/bpNBkBQKx+0w8qDm4jPKQwYMarPgjUiebf049Jnbqy Il8R2PWxPTMvD2NSfYlp/EPRy0ADJosOPpEsElWY66UJZoKn9OR+J6i0OUUcTrkphpGLJxz 0lwTMHIoB96oBr5vHGgfoefQtENDzfO1iV6hpe/z6mrUYBayD91mVklVXisg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767025410; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=c7QjAJ9sCVsnlFekh/kuWrxdLsTxl+jFoKoTE1yy7ek=; b=mfLecb6q8dmFAqINaXHfxlUeoMkMpomNfQETuRcX+BW9cAcsLhbHXLcCakOErZzHowZ7p a/0n6gkHjOKV7MOerarMIAxqFopYbihZ3VE/+x9aJlpCUmxq6RTbkmQla85ybHaatpwj5xh j+1Fzxf+n+ZydYMVQVcd8mb9WRqx/mO46IGXW4IMrKOzqfRJalxuFlFpL+cLBVF59/PPN2Z TfnbLBxLrAMjhAWi4k7x0wTfNzkedNeewTLvjfMLIWqfN87G3yG7cLZ/zlZWqUSvdSpP/rm HLJPixJHjWmji3c2qiry0nfZBfrcnHsM+emuFdwc/KKa4VCBwGBBUzGoY3Ww== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767025401; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=KALrxOZjSGmy/tnVLCivnJQwskDzOrU8C8/GqEawXaI=; b=w9jy6vFwZSIL5VpDOxAF1Fa4CRKhEjqVWFN56vHSWkx+8+3cGA646Ip71QxJe6QET8fqp ipxx6pQU/ubvbb6KoXpAdvjEIN1ASy/NYFUMcDNa7/+C1NEZ9XlEWVf0Rg/DXsXJ2rAfkLF WTd09JW2D/X55x954sjQy87LHwjdqyBnoaMLO5IRe66q4GJ8PzsfHqc336oMCMrKK/PzIQM VpSolmw2YGg1dnfqpj1kpPtE1aUAqNFJcFRKaDR+7ac6nymMe6TrxSWLzR0Hws84xtiCVbn gaaWmpUURyWVPHxW8exCcDoEaGuoY4YgzbgMUgX0rzL74TapCchTQZ3Z5hJw== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A77CF690BF5 for ; Mon, 29 Dec 2025 18:23:21 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Dec 2025 16:23:21 -0000 Message-ID: <176702540185.25.1832840645876291940@4457048688e7> Message-ID-Hash: SGR2OJ2BBQTIVJ62N2HSA3NWQVM2V2O3 X-Message-ID-Hash: SGR2OJ2BBQTIVJ62N2HSA3NWQVM2V2O3 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: fix some error return codes (PR #21312) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ramiro Polla via ffmpeg-devel Cc: Ramiro Polla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21312 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21312 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21312.patch >>From 254124f8699ab9225e0ad6119e06980e752ac836 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Fri, 12 Sep 2025 12:04:23 +0200 Subject: [PATCH] avcodec/mjpegdec: fix some error return codes --- libavcodec/mjpegdec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 05150e982c..9b7afc96e8 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -210,7 +210,7 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) } index = get_bits(&s->gb, 4); if (index >= 4) - return -1; + return AVERROR_INVALIDDATA; av_log(s->avctx, AV_LOG_DEBUG, "index=%d\n", index); /* read quant table */ for (i = 0; i < 64; i++) { @@ -326,7 +326,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) if(s->lossless && s->avctx->lowres){ av_log(s->avctx, AV_LOG_ERROR, "lowres is not possible with lossless jpeg\n"); - return -1; + return AVERROR(ENOSYS); } height = get_bits(&s->gb, 16); @@ -349,7 +349,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) nb_components = get_bits(&s->gb, 8); if (nb_components <= 0 || nb_components > MAX_COMPONENTS) - return -1; + return AVERROR_INVALIDDATA; if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) { if (nb_components != s->nb_components) { av_log(s->avctx, AV_LOG_ERROR, @@ -757,8 +757,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } av_frame_unref(s->picture_ptr); - if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0) - return -1; + ret = ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF); + if (ret < 0) + return ret; s->picture_ptr->pict_type = AV_PICTURE_TYPE_I; s->picture_ptr->flags |= AV_FRAME_FLAG_KEY; s->got_picture = 1; @@ -1677,7 +1678,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, if (!s->got_picture) { av_log(s->avctx, AV_LOG_WARNING, "Can not process SOS before SOF, skipping\n"); - return -1; + return AVERROR_INVALIDDATA; } /* XXX: verify len field validity */ -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org