From patchwork Thu May 31 22:23:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9195 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp161877jad; Thu, 31 May 2018 15:25:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIWx1nCUlNeHPhGpKJjXE2AGt0hUkX0ji/fjV++Zjx+4MIJzbLu3LUBr8gQaWnU4dMgzJWC X-Received: by 2002:adf:f18b:: with SMTP id h11-v6mr7119758wro.214.1527805539033; Thu, 31 May 2018 15:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805539; cv=none; d=google.com; s=arc-20160816; b=W97mN3WYRtRfp78W2XYZDzp29DqUMIbao2IAvczF8rJyAZaNPgzebgu0Oho5Vmu4JZ yxh6qRzzVw+V08BNuCnMahgsC0w52bZ494o5PVTQiGM4hoq19dSkp4qQ9qViL9ilIDnR QHVMCVzIyY2neU3jHuVUXXEeZ9IAEV6j8SKttETcuA2W1xpx3H0rWfROXtIJ6tEKmHV+ q7yD3xoVwtuJGKhefXOYC4uhl+OqMIYnmBs9RPb+dty4Y21Cq9XQjS73GadMHzRUuZ6N IDMkgwDkHbkov35MTF3Vsnd407W/ucYfGRF7V89juIc/e8aWOc0s+m4LK4OnW1dw7U56 Zifw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+V/gy4Yj9nLF4yQll99AKOgnMRf5x/b1XYVGZq0Oa7M=; b=A3POS6iPHvaNYqAxejjassrxIfH4ObEOnBk7ZTX5gkqFqtdbgmwmJAnWKXFGOhR84K DUenIxakwmFGXovXD60KHDXffWtJ2SPfrNF83nbWspyZfK5oTk9L0TmbfTg4WqfsLQ5J fh8owBDdYdOSxC2yvV7eSIXNhKTB7zyrdlpUBjostyfCXMCRP9Hpe0QKQFaIK12Hxynd 8+tM8Eqir2o0zDc7yMPeyV8xnzPhPNJpHoz8piQwdWTbqGabmcFh3HVp8thOAVaW0uyn T/g/bFmNeYjRXM5/Nj2xuQpY+/NwENCsls4WP+OH28XUYQU8ehDchhi00/DRuJ2HLlyS YJ3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=N3MVi6nw; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w20-v6si15334241wrc.32.2018.05.31.15.25.38; Thu, 31 May 2018 15:25:39 -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=@googlemail.com header.s=20161025 header.b=N3MVi6nw; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18FBB68A4C3; Fri, 1 Jun 2018 01:23:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1759068A4A6 for ; Fri, 1 Jun 2018 01:23:48 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id u12-v6so34418942wrn.8 for ; Thu, 31 May 2018 15:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jmYE+/+MYuOgcHARYnTabPJWbj7QDoue2isgLxJRRno=; b=N3MVi6nwG1wK6x417zCluuiOdLcCcZHOsu4X7yLZN9t9SaPqODV/zDxNuUmRe43BrX U1l+tUZVnjKCumTskA9bJJCQNd6Dj44BXMgs0kvK5ltdRTE8pwchAQYBPYDZhgBV+vWg 4yiPKQVRG7YYbvJKz4C2iHYNyFN5fIUgdSaQfgRyAjmeI6f42v/O2B1xEi1qy1ZXmpk0 ptkV7ySY/zwprTTRddZnkwRUSwvs0Yw/BuXyJmF2uYAuEXe3Dvg2tWgEHqRGIwCeSArM Q6FXXbYB0m9TyNmfF8SiAPzJintw75olN6f8khIQuTlIdaFaWWQuHwp4KfShawY0WA18 A/Pg== 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; bh=jmYE+/+MYuOgcHARYnTabPJWbj7QDoue2isgLxJRRno=; b=HstrWbNMQriKKlwPVqKcHtpHMVeK0qwmP3roAON5XZTqddcxDw/vdAoPqS15t/gcqf ZqbBvxDc/FWQrsY+a9L5tE5tLjC69WQE7d/GAN2/kDTknFIWxh7gb3ZsRL1JQSbEFckO F7mSyHHsdR8s2VngoR8i9p9mbkjaFzbhFN320goxTHoc4UIpZ6zvtTYkwZ0SNmkSGSPN Vw9i5jTob6WHk9YcjcpP+TFztTH7voAP9wDg32Dr/kC8LYS9ML0rWBQpFVOBbc7P7NnV KpvxI8FrFhhkdsgXkWjEH17pTNVFZQQCjXc8pzzXH6px/EhIkAKKEs4TavYq7sTgsT8h wpeA== X-Gm-Message-State: ALKqPwds9kKX/NNJTOdjwagc//xj6xX6nM14XabLbEeTSdmtCrEfYLXX lMhtQtAJLn/8mNrKcxeBLMWhIA== X-Received: by 2002:adf:c358:: with SMTP id e24-v6mr6413598wrg.257.1527805472590; Thu, 31 May 2018 15:24:32 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:31 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:23:59 +0200 Message-Id: <20180531222415.24966-7-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 06/22] segment.c: Add allocation failure checks. 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- segment.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/segment.c b/segment.c index c40d1ad..986aeb5 100644 --- a/segment.c +++ b/segment.c @@ -82,6 +82,10 @@ int segment_write(void *opaque, unsigned char *buf, int buf_size) struct Segment *seg = (struct Segment*) opaque; seg->size += buf_size; seg->buf = (unsigned char*) av_realloc(seg->buf, seg->size); + if (!seg->buf) { + av_log(NULL, AV_LOG_ERROR, "Could not grow segment.\n"); + return AVERROR(ENOMEM); + } memcpy(seg->buf + seg->size - buf_size, buf, buf_size); return buf_size; } @@ -110,6 +114,10 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) int i; AVStream *in_stream, *out_stream; struct Segment *seg = (struct Segment*) av_malloc(sizeof(struct Segment)); + if (!seg) { + av_log(fmt, AV_LOG_ERROR, "Could not allocate segment.\n"); + return; + } seg->ifmt = av_find_input_format("matroska"); seg->fmt_ctx = NULL; @@ -119,10 +127,28 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) seg->ts_len = 0; seg->buf = NULL; seg->avio_buffer = (unsigned char*) av_malloc(AV_BUFSIZE); + if (!seg->avio_buffer) { + av_log(NULL, AV_LOG_ERROR, "Could not allocate segment avio_buffer.\n"); + av_free(seg); + return; + } pthread_mutex_init(&seg->nb_read_lock, NULL); seg->io_ctx = avio_alloc_context(seg->avio_buffer, AV_BUFSIZE, 1, seg, NULL, &segment_write, NULL); + if (!seg->io_ctx) { + av_log(NULL, AV_LOG_ERROR, "Could not allocate segment io context.\n"); + av_free(seg->avio_buffer); + av_free(seg); + return; + } seg->io_ctx->seekable = 0; avformat_alloc_output_context2(&seg->fmt_ctx, NULL, "matroska", NULL); + if (!seg->fmt_ctx) { + av_log(seg->io_ctx, AV_LOG_ERROR, "Could not allocate segment output context.\n"); + av_free(seg->avio_buffer); + av_free(seg->io_ctx); + av_free(seg); + return; + } if ((ret = av_opt_set_int(seg->fmt_ctx, "flush_packets", 1, AV_OPT_SEARCH_CHILDREN)) < 0) { av_log(seg->fmt_ctx, AV_LOG_WARNING, "Could not set flush_packets!\n"); }