From patchwork Mon May 28 18:27:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9130 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2231393jad; Mon, 28 May 2018 11:28:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJFkMY7pQlxKRCq5ExFRzGOumnXARtieMhrG5lz1RWb7Hjszh/L83mV54Ukul/dMdkD54JR X-Received: by 2002:adf:86e9:: with SMTP id 38-v6mr4844685wry.232.1527532089156; Mon, 28 May 2018 11:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527532089; cv=none; d=google.com; s=arc-20160816; b=Ssv9BlolC8GzfWREDegSkXi/nnYHoeGp6XA6ZopXfhIKUyfT5OdIk3aY242jQ564IY /KSoMWrqNbrMLspM4F4xg+OR61okaGUY6EWwDSW72vBGHCXGAKf7UYE0qYAdXxFSpSJC rfmSmweZ4EOglpuaPesCrlFARibSAQsHBJ+0ygNoz/Wf5ekR9hPZ0FJ1TASK9SMpQk00 /3my8okvYXZjUnNO3LCmEUobHNdHz90oQ6Q7kH9Uju6uyQecyBjyFon/9+zarNX3aIpH +Ie3za7sCiX+gRVY018pgN1NYdxeN0wp9gd8vRwnn1A5bUK9LKZFgoIyT17e1Fa5obR0 WLig== 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=X92N3TuQROzxhJbkF7V/h7Inq7iEFV47TAU7pFbRcG3W6fvxJTYaKe/wjgw1xbnK+c +w9fBTBl2Hhn+DYwG0wAmD6S8HtS+95Ns4cXgGwvpQ/i96+mMUP15q76k1jOuVC9+hmp 03RqAlRzs/MseURlXpE5t/GwqNh7w7q0Yqx2w1FipNRc071EILAH0inQFYIuCpvq188D 0eCsX/u/8WxRSg9kZ638nZKFEAuaWKPw0jGPMOsfAAqirjB+EPS2fqAGm3Id3y1MGjU/ CEi83l4Idzp/W7FY8hnnRi3V5j99E0e5419zpmxtKaeRFOkSq5R/AsrXDA3NvuCCl8gm FksA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=go8n3oh4; 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 184-v6si10378315wmt.166.2018.05.28.11.28.08; Mon, 28 May 2018 11:28:09 -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=go8n3oh4; 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 2B1A768A3E8; Mon, 28 May 2018 21:26:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFD8468A38B for ; Mon, 28 May 2018 21:26:44 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id q4-v6so25313997wmq.1 for ; Mon, 28 May 2018 11:27:28 -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=go8n3oh410zZziOnh4AluBpLByt5EbuGaLW5Ro+UT3Syti3P7fLqthD0KbcsNANupj JIoWuPqs0nXAE1QjEgGNxlmc0MaLb49V/u99MCTsgBY0NUlWhcj4DQ0+Qh2b6SFdydhE Vw+5mqtySq8iDx6IdBw7tNAV7xLdv33g1OZOCXh9Sz3NCrQzbgEcIs0JwhLsBDfH/ZDU w24iGbhO9ltcnIzbyTe3zj4BKJgN6rwA88IWPbN1CpdZIiIthnNWLiJOnNEUps8shMFD QXjs9uJ2hgKk88UwLTrSYmA2ybnvsA666M3HVv30R2A6UZkOR3MpaOW1zyxJZ4iBtP3M raJw== 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=LBoNETrHYDSXkt4MhHsA3i5A/wccaN53cjFS+dCrtks/P5dRCWnetWf/5dgnjBMTU6 ZEMyj7zzTBlAkXuY5TAIBC13mfW0FdZ3BlhX1dFcOttJcwAszCidasOsanrM+K5MkWgq +Nvxl7ml19vnSUKN2sWhOPHRVkLh64nGGpWFav4UKrWDFY0jX5zQrFKc8oB7eGL1bpk/ WxkDzRPearLuoqJ5uASNT/EMsPNKUjSNZCvkC7eqKyvYAnYRkjBMAa1lna4LC+GvNyja O4N2H6x2nopvmPNP3QfK7RalsOYnkYMoutEdzBoAB0MYW59Fy4Qb9VMCWLk/YHt1neIx 98wA== X-Gm-Message-State: ALKqPwd5Y3UJGVHP820uxBiwxj40XBJZxE7dei2Gqft1okll9bspeTFX DnuoX/lYbAa68D5uAJQWFzHpEw== X-Received: by 2002:a1c:57c6:: with SMTP id l189-v6mr9539178wmb.161.1527532047608; Mon, 28 May 2018 11:27:27 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id g205-v6sm4126285wmg.43.2018.05.28.11.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:27:26 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:27:07 +0200 Message-Id: <20180528182711.3221-7-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528182711.3221-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 06/10] 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"); }