From patchwork Wed Nov 6 02:49:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16121 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 EE6A9447DB1 for ; Wed, 6 Nov 2019 04:50:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D34AB68B071; Wed, 6 Nov 2019 04:50:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3196468B03F for ; Wed, 6 Nov 2019 04:50:44 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id c17so1642698wmk.2 for ; Tue, 05 Nov 2019 18:50:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sB53wIrUjJDBGI/Gd52ZJ6NTEB8g5h9nvpLs74j7CDA=; b=pcerYltz/vwjZ35LFarTGNs5XY0PYXGH9hHBIzI/YlJ0y+rQKoocwlHkhASSvbxlrC bVRgV0YQTDqnaN2MFVh9vR1NIpc6WMx72r008iGzY4jWn9i//yo5fnKXjxpmuQZgGSAF VIoJtTxBAdioHMKyKErAXNEPNmOD/DxfFycsjlTtOfl8pWf9QUs2EUakD96sCsQPy8kx QAXdkncu3sFG4gU4VUEPB23e35gpDHrx4U0ZyEovYDEQ6b8sgb994mf+QST4f7EfV2+Z ZNizcb3hWl+bZDEvEriJqX4520LfVB75FSDoEe9O6d65zLpBserddiZ9rPb6YI+yhfNG Mxcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sB53wIrUjJDBGI/Gd52ZJ6NTEB8g5h9nvpLs74j7CDA=; b=CyRazQxoDtQLcplS5Z89xs8OmmFCdaHYhj+3NSNpL//mmvG2u3ljPLybV/0La1HdzT qlN5IXWcm3WdnSkGRon2iy+A0KrqEqKn376dqbP6601Fybjng/L9Wt2oh7Xk63gzO1Qi giavZwPaC2limP12YHIhutx4Hm/SUaKq8Z6alQnuIAGZxOzvw2EAegZhzHkm0QsrdIx6 bm/Zh7T1Wk4Qd6CjO7fJyMNRKvKxJwqzryeBQwTCfcYCqKFWEVGeshlvWuQuPHXtoLDh 44aIuNUCKyeNj5xtz358Qa/KQsAx4YDJF6TXmhLMbifWPcwNYIaA4d8sr9AG2WslC4Qa JjUQ== X-Gm-Message-State: APjAAAWICz60pmxia5mIFPqRfOooLth7pLhaUyQ7N+rsQpUjrXTDXa9v dDicPjKhm1bV9390CMlFSy6yJEA7 X-Google-Smtp-Source: APXvYqyMCeL2MX9n1hWo68EgXgAn0BbgWBrt15yglsyOzOifqi2pndJAF/24nv7yhgl8KVUhAWyg3w== X-Received: by 2002:a1c:9917:: with SMTP id b23mr319760wme.42.1573008643542; Tue, 05 Nov 2019 18:50:43 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:43 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:04 +0100 Message-Id: <20191106024922.19228-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/23] avformat/matroskaenc: Check functions that can fail 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Sometimes it has not been checked whether opening the dynamic buffer for writing tags fails; this might have led to segfaults. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 179349690d..274f62dd78 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1552,7 +1552,9 @@ static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid, ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb)); if (ret < 0) return ret; - start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); + ret = start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); + if (ret < 0) + return ret; } pb = mkv->tags_bc; @@ -1650,8 +1652,10 @@ static int mkv_write_tags(AVFormatContext *s) if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) continue; - mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, - track->uid, &tag_target); + ret = mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, + track->uid, &tag_target); + if (ret < 0) + return ret; pb = mkv->tags_bc; tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);