From patchwork Wed Sep 28 23:51:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp596450pzh; Wed, 28 Sep 2022 16:51:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM44o8/W4gXoc2BdM9PcgmheMjZp1oUEePVIO/u4GvKe5IZNErVNcV+Au9hqu8XJ0HKg9zOF X-Received: by 2002:a05:6402:1e8c:b0:44f:f70:e75e with SMTP id f12-20020a0564021e8c00b0044f0f70e75emr473876edf.405.1664409092754; Wed, 28 Sep 2022 16:51:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x97-20020a50baea000000b004469a602b4esi6177514ede.66.2022.09.28.16.51.31; Wed, 28 Sep 2022 16:51:32 -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=@outlook.com header.s=selector1 header.b=V+O6figp; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A26068BC3D; Thu, 29 Sep 2022 02:51:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064020.outbound.protection.outlook.com [40.92.64.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 691C568BB3E for ; Thu, 29 Sep 2022 02:51:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jyVFP7kJEQq8VgmotqJ9CllTOpxz3xIQsNLNImXsPOQg2mcMpi9VkxZYf+1Su8sJNkGmuWm8oxtSF0wF9HSKHkOroTD6jHXDXD8vgxKQCX55Y1++J37wkxS5BDsslk8WX7VSFLoZkg2JXKHgIcmqsrGAT7BTMHi+k6CzwOzQ42+gakSWVg32VDy/cTn2oozLqDn41ZA7wWBSuEQTE8DJd1puh/3KltHrZse3FUQtO5jmwRonAuB1gqoc9KXJWY/gjTenwWtV8DFlJJ9k7w+lhoo13I6i1p0INOs7Ox2lG9t3B8fZn5t50HIa/2l78MEHthvUrRCCK5yIAyaQJ+gpSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/fkTnnotlbTdYcxvyHJ0nwSAWXWYTA9KF0sq+2lAIOk=; b=ZBDVlw8XvQdyoFSo99Y5uEk29GxZebK+0tu81dP09iOKODBD5PGgp/sGufYB9YeyI+DcnLRfKefZa2OzFnuVseBOnXBFM493KNBG6lv+PSOeNUfb1wcG8N/szLNY+KGi6Kr+r47KcZd8PiJkaKcFUb25WJS6IypzfKpwXT9BOqbTK57XrTiiaSjIu9PHl+D2LN6WVrxkgG6UzKQJRlF8zNiVh1buAKYGFjpX5G4PTUm3Pfye0Q25DOJBjIgb7+bQFWtIj5h6DVKBmRMahN/l5UTHmlXoVfmQMm6Jzhj2GKdYDnncdyOCDG/7OAln25KMArcdrxJEHmu8m2/LTgat4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/fkTnnotlbTdYcxvyHJ0nwSAWXWYTA9KF0sq+2lAIOk=; b=V+O6figpwouz1+3V7XSwTILvabLYql2LfUEnw6otY1zmeZNpRdGRlKkgy1LB7ilJ2ca4aVmUSoHaMdkczCKPJEyneQ24YI8AkgPOKDYm489sA/I7wAgflLPw7fMki512pGbbgJgltE7CDQanKY2Geaz1KQGXscykvTcLa8Oi8dudw61Rlw3znAukkoGo3HjtlHaxt6fVROZep0zX0RUe2dweSyDZ02zGs0c6T+ny32nT1iuPK2FvXhcJ6RLzZCp2C91WaP/ITdw8DEguCBUp13bk8ldwx9UdoGnL8p/RGO4pOFwy9qAMVdlc+j1tccZg7Xo2MFBpGtlvw3k7oU8Qyg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0496.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.24; Wed, 28 Sep 2022 23:51:19 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Wed, 28 Sep 2022 23:51:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Sep 2022 01:51:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [OawLgnD5lIzNHU/iVKBvzTLTyGe6W3+w0V3LVSm2rQA=] X-ClientProxiedBy: ZR2P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928235117.1659624-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0496:EE_ X-MS-Office365-Filtering-Correlation-Id: f5d9c770-d8ad-4496-244a-08daa1ac5713 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpPcoZqFl/i/udmE09QtN0vCj0PCN7fDJKq3mX1L0D9Pq7H/6baDXY9QWSjxOZ9nI9hC9PV+1TKHqUv2OR+aWph+dXw1XNI2ew1IlSrQk83yEUFOmmJMyGfyt76weWC5RZnzq7g+rvRdzVoM5rSQ2g6Y2UrqOfCUNrLD3VZK8JtDec3Ex4QkXQK14DBWUY0cWDwsALm4oEgc0LNHAKZRprW+oDlAc4VFJXW7stlmvlDEHQABpMuZ7M6pSoqL8MlBhP6aIdnvZHAlMxfYrj+jgymvIxqZ03SqNLnXnXBwhT0cDWZ4xkEiAQCndaM2cqdehSgfF2UaIcS2dXtwvhTv66Mf9EFKMP+4BAexWF6/0s3OwQvuS1e2lI0wc6TpsuhktXO5n5Vl/PqQbHenaFuC9foatxEnAocHQf90wm+q9nq8EAnWTvQuF0CGI7EpeJKp79Q8kcGqC+9QZfGc/BK8fdIudQUiSC3/2IIurEPqkmGU4cn+S/oactqzYbgrCGYPrUjJdLsUCMbU4kIT0UkyPQhfXk2OltCWOqH1mLSEMVUT31CjtMw1Y7T9ro2rCeLfuZVVIXdcHmBwbLaGAlVgzrFckXzXskFEQil4bkRBmoLQbc3H2QSIV9lb38TsweU0kyj04vo7e1Zf/uzuYhZpEgHQ0mo1lYScnYjJabXgnFy2MZCsl4FKsY5sO2UotWOedECiVPf36eQ4M4cxQQpJ5Gb/PRRDTHLDTRj+FDiJHb06RP9QXpWJjnlregwBR0xOpI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JBQ8Ian4kynKepr/u6JpIFJHelLeVddyDN3RTtcJH0JrblmKHtkRTV3A0IMJC3a1RoUQmIlcwoLdM71X8nEPE9iL5BSWDlXdCsjafl5z4t+LSiHRWs2MDydaaKibpPv6qLJyXRnZ65yZYw2Z8jXp4tt7C6hbxk1bSqrc0VJb8opKTWwuYFsC6LTiaAkoSKZ5DQWIbK+mpKWe/ukifgMYJL5yqJLXxqXmkReou7OF523cpFNfXHXdamY5KooJUAkvBVAePHW46b9kpWAbAwS6pUd50aTkqMhORZdMlFdNVhatNybljZy9mGG9BK2mjVgEC3j0vBZwBoHenVaYkBEu1fsZ0ILF32Q9Ialn5SJmfSIB3tVx3gSFU4yn+cj3jDnPr0DcUID7Pw23RtOjhgZGBU9ZpVYtEsbanrt8P9Moem7dDP34J630dF/mB4ky3Xs+KbQG6XtRWSmgYf1yfvXJTHD5wYi2+QTOHjXpT743AicTvxNZrrYOw7wqFMS+C81d2LMG8XBY9+PKm98dudobnn9Uvd4EXitmXVEkdglpTcZc2jP51fXkx61wkVTIEVh7yI+Zk8nTwLfZJieYrudLwtpxciOdSq3541C0cD5lGyVcOMyVwXOejeBHps7z5KVhNPxLPM7VUUm7R87nIP1doA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JiRpn5fvrbOOF+OKkqZg76Dei0fdgtI12si4Iyd5Qt+1ytjpSWQHem4YB+wGX3lvRzuDmIIjlmlONeux04tconfT0CpupuRyzeLyfBoKSaN/a5fq/YBtubEfj44CU5maQK58rd1Vt2OhuiJPXqh8ZfsLBHfM7IZ+FxgHsBjQ/gjpg61V87jcgquauvUHqk777MXzj4ctFro8+lcji1LuF91kmVGmx2UAZBbBZNaTg3aqfxM3ru7K/zKT6lhcdHitbbfQbHa8LdNfOlcNEqbpEKMnXS1yo2KwJ/UqEKgXGM93nB+irtcLXnm8cd0pRzA6TCDZw2wo519uSFz8GBO3kKfbEy5BmnO+qWCUdgADflezK30mHwsitAqpG7RdxIO9ryYSaPFXA9wg4IMBRhuKRYyEyHNRLmAyrXbJOSAqpIQ+tCAnwsSLBSELiYUQIF1MGtrhanuQQsAquU8rVkntYBZHm1rz082gg4jzrwWJZufj92cIWCEhkx14kSW5scYRau6CVacWO6GtcUTFw0/ZM0HJl0r2pP3gSBHDF+dqtDeVTZMV0+E+iAsEm8GPgVwd/d7PWp9zbqk6OoS0VYe+Xh89Fd7ENAcf1a7MJvaHodzkSgWS9sGn7GBBHDehjo6ffEUiE+9ajfn304GNkA+BCbzakcmABdaD2rb2XZ7YMzOvxF78TuLxQ7j4StRuxmYfCgLYjZs3z92rmLj2HrG0nYMP+WQvamzwD35mpu9yREc8kMjA1uIOn8aw4j2fytn8uoDGVbFqaInlUzOkAqJmIpLxZbRcwgTGzFH5N+NKZLfWKSgFAODDRd3Uqz/jCviltIb5j5Zx2Rz9dDA4W/bjRCIqD123BFuzcirNRKtMh+Sqjb8J+laBXwgD2Pbx3yoCsFxZf0x0DYhAr7giQvTyAc1jCGJFgiM8nTybo+FlrryPNCIy096sRaXvCmWpWxi6I2X5G9mODWpWlqaa8wIHJp/TPJ3NPwvedyCxGTkZmK9i5uAtn+nF/ucGgJ5WFq97eZzI+lVzNBwNLy1vqudxUhtAmFtfuQZEeABG9/ISdf4r0jgNSNHmMoa83EeOogTQ42Qlc3+OP6HGSL4MzsLZ+ZJ8IMqJ7B+DEhUGxlsbvA5oIrhMgUlRYvgy6JxzaXDzVvENiEuAnTZ8UB0mFvC0e+M5RsK7FnVvhEv6PaIIzMwkEyI4neAJRIo7SQPO1gK/6eEIRO3k/iZ4kg28xZL/qjwIrg/es33eE8U/MBDt/IqHkj0BnNJQ5q7BOqrpCIL7+G9odHtQ8PyZx7wZ7g2L7Ha70YgXqGT4Kv9AyT8HKHo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5d9c770-d8ad-4496-244a-08daa1ac5713 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 23:51:19.6790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP250MB0496 Subject: [FFmpeg-devel] [PATCH] avcodec/pngdec: Don't use unsigned for width, height 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EFa9ApvhBuAB Otherwise p->linesize[0] * y will be evaluated as an unsigned which leads to segfaults in case linesize is negative. This happens in the apng-dispose-previous FATE-test in case one makes get_buffer return pictures with negative linesizes. Signed-off-by: Andreas Rheinhardt --- libavcodec/pngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 582953d17b..3c3eca601e 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1387,7 +1387,7 @@ exit_loop: if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) { size_t byte_depth = s->bit_depth > 8 ? 2 : 1; size_t raw_bpp = s->bpp - byte_depth; - unsigned x, y; + ptrdiff_t x, y; av_assert0(s->bit_depth > 1);