From patchwork Sat Jul 11 16:26:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 20966 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D1C29448086 for ; Sat, 11 Jul 2020 19:27:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A776D68826C; Sat, 11 Jul 2020 19:27:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7694D687FCB for ; Sat, 11 Jul 2020 19:27:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1594484824; bh=P6ghsV2jtTTGbiY61OenTgYEbszMrZA1P31+mMORkWg=; h=From:To:Cc:Subject:Date; b=EYyceXrVcb4CHAKzg6c8ICih5I/FSTkwF6n4DGpWDaUuZdwdAkfTRsKP4K1+KIqaS WREZDeNae4FN21sKQn1HzKEXazHzb2dV6+fvdYcS48Rmwg+P6WDTxj1oiV6/36ZYJ2 dw0asDJSGDEhy6RMLAc9+N2Vo5kyf0dnYYLitozc= Received: from localhost.localdomain ([27.46.80.5]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 6C111273; Sun, 12 Jul 2020 00:27:01 +0800 X-QQ-mid: xmsmtpt1594484821tiewwmkrm Messag-ID: X-QQ-XMAILINFO: M/xzj1GOZr+/7UxgdZFACVj14QyymDReFN8ygUP42+37wNIOodz2cs5ECsI01t ugpyZamKyTj5TyUhr97w2wodCJ9bA0/Ih/W66ZEa7ouaVkf2TQsTkXbxI6UJjoxCIOr6qzgnfYSb m7lyd8+EyB3sKDywWuzikEXtl8APcU3D7cYnXnG9BmG4KiKcDyVYZqfulW23cXqYkqjIApOsWxGC eCnW1/OnoN+/YwzfYD1pZoJfCkIHEnJzwqdAvoCWLvFM1/KKc1v4h6IiJhJVyMtLDBS/SQ8WFyDY 4j2KWgaNrhtUDCGQoBXBhRqYaf+C6eZHulp5Q+X8rN8aTsyoiV0aVpDedKiHIBnqZf0nQtR7LE9p tFEewAZej4T/tNSbPpzc4Y8QX0mFdX3qyg4QDu38P2nqpjoNsAUlTUUnVtPfI+KYvxwXPFmz5qmO P/FZrFcJjyKVJp873z72c1B0AbxTwqEVMlFsEshfey3XmmMuNTabBWphwKgAM1KSNoJcpjqu1+ow iXSzdI4vByhK+UL5GoCAovCViph7zC8ZWol3OD5JY9Wy4y6WSXfjoRMgg12fODYKlaonKD8jGanF enCpyjaaGC96G/GsHL/vcZJEe3+HqN31hMiiRqYxMCL6DPDvWppV/11zRGlZStCux9NsmqxWvESN tCAZMvokrnuPx4hTFsiY+6G5LryhoVOEnt6hheh95XYTqj From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jul 2020 00:26:58 +0800 X-OQ-MSGID: <20200711162658.49332-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix atom type to string conversion X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20200711162713.A776D68826C@ffbox0-bg.mplayerhq.hu> The conversion was endian-dependent, and it may contain non-printable characters. --- libavformat/mov.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index da438e4e2c..ba05223cd0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -297,7 +297,7 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len) static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - char tmp_key[5]; + char tmp_key[AV_FOURCC_MAX_STRING_SIZE] = {0}; char key2[32], language[4] = {0}; char *str = NULL; const char *key = NULL; @@ -444,8 +444,7 @@ retry: str_size = atom.size; if (c->export_all && !key) { - snprintf(tmp_key, 5, "%.4s", (char*)&atom.type); - key = tmp_key; + key = av_fourcc_make_string(tmp_key, atom.type); } if (!key) @@ -7024,8 +7023,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_skip(pb, left); else if (left < 0) { av_log(c->fc, AV_LOG_WARNING, - "overread end of atom '%.4s' by %"PRId64" bytes\n", - (char*)&a.type, -left); + "overread end of atom '%s' by %"PRId64" bytes\n", + av_fourcc2str(a.type), -left); avio_seek(pb, left, SEEK_CUR); } }