From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2AE4443326 for ; Fri, 30 Sep 2022 17:05:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43F3468BBE0; Fri, 30 Sep 2022 20:05:25 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065044.outbound.protection.outlook.com [40.92.65.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1382068BB41 for ; Fri, 30 Sep 2022 20:05:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A5J3oWNj5IRzZSXfaRQzp5UZe4Z5KgVM3BI6cqKOWo24LNFdyVYQvhxU3ILJ5n9sdUmYO6M5OlIPp+OubcmSepvDpE9qI7MTUmlXm8zhQggONQ8p23Ust6XLEyh/58z5OKXczgQVO9r4oIim0sfAy+JmYIBp6srPfZpEtJvVgQGXq7LQH1qt+6geUwrjpu/am1qIMX/6pSCgTbzX7K/2vCCMPpKHQT/S8eR37z5bqYAFB6hQpTHW1JFyol/NUnef4FQ/d26GyoMrTV5odm1VcjyjAoFjiaL10jNLEfDwIDbEuEu1AVnzYrzUU5ibAG+MaqOVYMQwlrnuOgaVjR46nQ== 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=Tlva94tVC9SUWD7Mjm97Z2lMMvMKbGb6K2+kPurn/IA=; b=FQ3F7N0jxBgKlNjWt+OsmWuPyUxP03pQg+/hnc6EUYRIgDAgOyw2yT+ss4yU+N6+c1mrg+6sXdxxjotS/Tv86n9qqSaR8v8Q6CVyIJhukdTuvfLQ8KOU3EJdz3SZZrIxPSpxOKvttsW217Lk9ypOaAd2Ft4t0IT7AWKNOeNc94y7Su2GcGK/0Kmdn7Zd7lYADhrLURykzpkf/91Rbdp4EZ6jzOht67rlaPpXZRudn0u7dN9MHcTqk/xPSSNu7f+Yu+fp0if2I0Cq7QlzLsCHVCMKKG5U5eitKgE6ROyx7W7bwMByPy5vt0UJbF7wkMeKkN0X6rBxvKZzOUdEzLf2Xg== 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=Tlva94tVC9SUWD7Mjm97Z2lMMvMKbGb6K2+kPurn/IA=; b=h5SEmfl4VDWatIo2+w/Sg/4AF25jKDwp/MtbG1phHNDiuHSchULK35/4wJkgmldutmAcgh+dxmj9aKPTyNQTYB3uBph+mIc6RIQX/6b5anfF5PkEHrBT6Q73o7oCsMzu1E+Em47ZHRWgwrDO5NT0Jj7IEgs8lVrFEjTqy2XSFIbPbR0016Ok2d3o00KDEZsMQDovJv/Dh1flwLc+TolgsKdLDz+HHkm1QjxRdnkB6ncEBvp5n3hcl9JhOZeMNl6OPof7xFRhAwiDNwcaN2oiMN13/iWao5dMkxlYi7eQNevQqj34/CwZS/06FnfP5w8RiJreTNQ1dKF4/Q/EthgsiQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0175.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:274::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 17:05:16 +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; Fri, 30 Sep 2022 17:05:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 19:05:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [tF7nHvOlYexJQClH35+RdAY3ZmWDfZcsAIBZeGFqY0U=] X-ClientProxiedBy: FR3P281CA0040.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930170515.3648239-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0175:EE_ X-MS-Office365-Filtering-Correlation-Id: 80c4a5df-6b40-4cc5-4a9b-08daa305f234 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrST/aUJU0/QUaXtXS9lKwz3e081neeoua6ykP/oFTdZu9H2pO0elfSP2DnWRODcsTvxQAlNXXZm2DJvgT2cBz/gz83tASRt8l+oOd3PdqDQQdpPOCzWtQtXYZ9lGjvfcpi9js2EpydptKcjDu6qiNtH6U/qvztt44cmnm+sPGdKCuY0dAW08s4WFlxJJvIXD/lVAVVLN7D+oYewlD0fxxEzWe+gzZFX1kiT1vwI2ccCf30MCu1gF+nzHCboUrdXenuo9bsE8o5JTEgHwh0vo49wVjH7N2XJNw/pg/xDmIJkk2VmwB5h1mll7WTElCfk+qdGQ4kVj+5R9U49ya1agl59L0XhCyxyxZbsfwXoW/HlTv+ydSkNz3c4O7FQLDT0qIIp2QhrLAquswjEUyCbv4CAhXJZb4e25GBcANIhHtbj4V2olTVEPo1M+sVHVOTPsc+YYL3XYfG8rwsWef7UcAqN68N6/ZFQ3tNu3M7dWVj/wcIPqJKZSy/Kes7pf8RrvxbwpPwAp9jQNg8TfU54w0q5xg9PrEwPXbf2r4bN6cW1GcvTEG1AXn7kgnt3jwot/l3DNhNUfiNYPGuoSgb4ycjeyOhphpa/iAx/OAQXpTPNy0v2ObDQkdun/+sLx6sAxJjlGhyBbYsvis0EFPfNXU/bx2pi73MqTlCOTTUMyFRvA3I7Q74vjbx+dLXGmI8jsocCnDRXh/X0o+WsBVjLZESmQ+bWkWv/VhAyl/rAf3hkp89SaEcPqzSx3k6yw2ArpM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zGaYXPh9PxuAAZ9Q7C5skA18iS0GMLGZCxN6OVXJ8MFRCVIUlY3AelZKD7vF4lo42jNainJc4SW4KavO0YmgHnhzfvPie2SpIRs0zsOjrmyqxDr2ysuaZaOWyBr+LQShLDTwOjSZMuHHWAnNL1KiiwfJRtGIkVdRvhfAzQq2FYGhSig5UmJq1FRky7AY9AIAv8TofP7i2UeHW568gYWFpn4Sqp+gleS02R3D/w02JpjFg2QwEsn27lxO67jbLWfg2N97H6N5Nt62l0O8QkqNRq8uVYWEyAISxiXbE8lSi8OvHw6m1PKe01KRwnUcbMxm3srL6BErtyxhldsCwKedsxtw/c0CqTwZ94CidB/iX3r5Qrii8DZ13TX4getMkWwqBzmM0E+u1r1mTPA9VjZvcm5ztrMBrvGW0CPoplMlg2gkznRgzNZ3Q2pLMMUCArlnTDbwEI/cqylufUJZ8fMOBKmkH4tEsytDermfYGtOKDgK1io7o36uWbry7DGHaS0ox94mH+lAqzWPLuok71SW2RWxBu0+i9fXWg5uGL+gy+aFuCDZxloi7Z31do9WHdgpunwuJ+AsfO6Jxoul6sO0XS1zi++QN5kDVkRjeJ0MpsNv5JZ16/eewhMzAsM3rGhFMMoiLkpv7S1JcPXYtV8WLQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4tQtZvqYGb4ewPmUB4bfvXxaC5YvatyLn+2oPS2I2NnqeSaagYzbOtj/2ytK?= =?us-ascii?Q?qfhOvRz5IWAPKY2BqBEzb4Kdrwr3UPfXEQZxRJiI362zd5Ds2gePPoLkdZLL?= =?us-ascii?Q?y+W6b2enhVyw+pbVDYDKPe+QGrJCbKSFRHmHqbUiJrwUeIIAt7ngYwLhT1MC?= =?us-ascii?Q?sv+Ow7uX/u0Srh2pcxTnCCyafeKIhsmH+xDvI8d2gQOPIq3ina89DVEwjXrf?= =?us-ascii?Q?xd1o29xyXyz0hu0+dXk9OM35Z1xFxOS+4oqMvAbj6SJZAOm8y+aipeXagHz1?= =?us-ascii?Q?12Rp/vSdIc1DobRc7ptz+XbJE/cd+7R5j1j+644V3zug0b+QMHerxUUFtkLN?= =?us-ascii?Q?BTKLFV2Z5PwHhmJQehrM66W3O+IK6BcbLYbHBbkQUe8qQOJAJa1/JMXWuAAy?= =?us-ascii?Q?inK54JxsXoIzhMx+cV2rL/4m4NkeX/RDGFa/K24F4pCb/MPsctyu7yY3nYsG?= =?us-ascii?Q?I3o2GeOkfdWCZ60lWL2PFBkJH8B6IsRR1sUw32cnoo3XiDg2lFLx0KDu3iG0?= =?us-ascii?Q?qN7BqgQFo7ickyuhKXLuAQE/vSs3DHlQgfRH0yINN7/sXmYjke66Zijb7T4q?= =?us-ascii?Q?B6zOaURzu1g68zjB6mAYGA8EzoOOhQXztDzB5VnCXMyC6ThcxA7EVljghI1B?= =?us-ascii?Q?x2OBkWfnjDh0ZPqGDjoxVeon6G41KG4yqoipFpRohml//+Rbxrf2hRJFwm7O?= =?us-ascii?Q?Qc+QOK6P+yOZYxvVNXhDNf3Fy/K+qYS2O6IkgCutF4D7guD2sdTHbghtNE0L?= =?us-ascii?Q?OiMMstmDDL687imHHz8GWmzr4XqfXZi8PRc32HvIEaPlHK+/OBC2msXAYBDt?= =?us-ascii?Q?MlRl9/zONGUzw+hiUpSoYehl0T94JQ6QNjEcgPX1izibh1j/dehJTCBqAy1Y?= =?us-ascii?Q?nr77imxbxWDeiyp8CMK+jlJaU0fnseICtyuluhfY8qNrVzyqbG6/9AfZoj3i?= =?us-ascii?Q?Bor6xISRWhnMuwoyIJ20EAXnGJZjhKjXU7bC8cGeGTNO9JzDeNLRR9rQxHp7?= =?us-ascii?Q?FHknEu77/p2KD4L9nI+u+6TWFx6GrzIgTa+3DkjgKDf6QBenGnKVCc+q6fJb?= =?us-ascii?Q?9w+PDIQpA8+3pIOH53ReHjCVEXRicgl/95THPHl5x8AAO8BdwRLyydZ8Ci9O?= =?us-ascii?Q?rO9zofp/SM8FG9ykoZr/A78t9/rr4lEp4/rlvbhuO66OJa0eQD/73xzvjgQ3?= =?us-ascii?Q?cAl1W4ZrXCwW7GwCfqM+fmHpcQeFeKES/2dsOXUD12yVFZqlPyZkX770NETV?= =?us-ascii?Q?/YhZ2LnuCK9AW7uJI6GntKKVdBT9/KzHf0focZ77qncBpPeIt5CX5q7/HjX/?= =?us-ascii?Q?BoM=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80c4a5df-6b40-4cc5-4a9b-08daa305f234 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 17:05:16.1742 (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: DU2P250MB0175 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/sgidec: Support negative linesizes 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The earlier code used "p->data[0] + p->linesize[0] * s->height" with the latter being unsigned, which gives the wrong value for negative linesizes. There is also a not so obvious problem with this: In case of negative linesizes, the last line is the start of the allocated buffer, so using the line after the last line would involve undefined pointer arithmetic. So don't do it. Signed-off-by: Andreas Rheinhardt --- libavcodec/sgidec.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index dd3dc46b48..a449859bf8 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -28,7 +28,7 @@ typedef struct SgiState { AVCodecContext *avctx; unsigned int width; - unsigned int height; + int height; unsigned int depth; unsigned int bytes_per_channel; int linesize; @@ -127,12 +127,11 @@ static int expand_rle_row16(SgiState *s, uint16_t *out_buf, * @param s the current image state * @return 0 if no error, else return error code. */ -static int read_rle_sgi(uint8_t *out_buf, SgiState *s) +static int read_rle_sgi(uint8_t *last_line, SgiState *s) { uint8_t *dest_row; unsigned int len = s->height * s->depth * 4; GetByteContext g_table = s->g; - unsigned int y, z; unsigned int start_offset; int linesize, ret; @@ -141,11 +140,10 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) return AVERROR_INVALIDDATA; } - for (z = 0; z < s->depth; z++) { - dest_row = out_buf; - for (y = 0; y < s->height; y++) { + for (unsigned z = 0; z < s->depth; z++) { + dest_row = last_line; + for (int remaining_lines = s->height;;) { linesize = s->width * s->depth; - dest_row -= s->linesize; start_offset = bytestream2_get_be32(&g_table); bytestream2_seek(&s->g, start_offset, SEEK_SET); if (s->bytes_per_channel == 1) @@ -154,6 +152,9 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) ret = expand_rle_row16(s, (uint16_t *)dest_row + z, linesize, s->depth); if (ret != s->width) return AVERROR_INVALIDDATA; + if (--remaining_lines == 0) + break; + dest_row -= s->linesize; } } return 0; @@ -204,7 +205,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, SgiState *s = avctx->priv_data; unsigned int dimension, rle; int ret = 0; - uint8_t *out_buf, *out_end; + uint8_t *out_buf, *last_line; bytestream2_init(&s->g, avpkt->data, avpkt->size); if (bytestream2_get_bytes_left(&s->g) < SGI_HEADER_SIZE) { @@ -258,14 +259,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, p->key_frame = 1; out_buf = p->data[0]; - out_end = out_buf + p->linesize[0] * s->height; + last_line = out_buf + p->linesize[0] * (s->height - 1); s->linesize = p->linesize[0]; /* Skip header. */ bytestream2_seek(&s->g, SGI_HEADER_SIZE, SEEK_SET); if (rle) { - ret = read_rle_sgi(out_end, s); + ret = read_rle_sgi(last_line, s); } else { ret = read_uncompressed_sgi(out_buf, s); } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".