From patchwork Mon Dec 16 00:04:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16814 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 00C2F44A07A for ; Mon, 16 Dec 2019 02:04:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E168C68AB57; Mon, 16 Dec 2019 02:04:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 281A468AB17 for ; Mon, 16 Dec 2019 02:04:49 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id c9so5134034wrw.8 for ; Sun, 15 Dec 2019 16:04:49 -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=ua0wFr8q0YoBs9xpf66KbfRyYgYYZamUyDFq7gZQ8M8=; b=fs7qgWaGrxqxoR7xUt9Wfr0VEScZXIyQgnLwPy0GvswIyyIJUzcxwIGhdqfsIkrIXJ u7nhe9QzSvLOAJO9bgm3phnFECGPniHKJ1ijSCSeIyaaNG+4NeIK87nA94jTf629P76N FO0dE3ZgkAdiB6o9n/9F9AADl8gs48KfNVTsjA1pg6Vtg4JC1POuFADe35QEcBAr6/+H 10TKLLYL23TcOHsUq98GhzPxBUDlp0UImq7Do3dP1jJdYmSghtaDJse2heiBy6PulIQ6 YSMZKRyhGUn+1gmekGOpN64RG4KndZm7PDCbOGxGWPJolrOejCKmP2wkXrX3UGH0PKi0 3ZeQ== 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=ua0wFr8q0YoBs9xpf66KbfRyYgYYZamUyDFq7gZQ8M8=; b=eSACwKRsodYy9rSHMP1U6CCjycrGWJxzcRZdrTvrOgZFcZgd9gv7QA5sAEtarDkUs7 cuIN2spPA+c7/IYXXg7DJzt+pYErGKeXBtNEt1JiFToS9t6ENKgYaYQ/a1v7GpQ8omXN K81umW81tBXuNLIQhBiQpwX4HgR/rvGSzLpDM7vnQ9BZqOLqQ5HPMM4zThrIDTS+WYvN 2qYsxcmjOBIjjG1BUEc+dfRaLB3Hx9iDd09d7d9dp4khCWGLI6WMRv5bo06aBJJ/srFU 9gI8yCBy6LG9zqTpI7ekEADD+QYh/stGSsXKD4+5bO5Vuiljr/gwcI6+q2cCaDAEOj6n xktg== X-Gm-Message-State: APjAAAX4RXMzcXDM7j59CfY1X1/+6sPv88JXUrwMrF4Fxd1L07RA4DOt vY3mjlTnQHghhvmOBC8J1sG6W+iX X-Google-Smtp-Source: APXvYqzaocZ7crvbNPWno+lH/h0vY2pzXTHP+2SaL9yZv9CUchoM+JDX3ayWD9xf7J7kyDxQwm+A5Q== X-Received: by 2002:adf:fc0c:: with SMTP id i12mr28154573wrr.74.1576454688288; Sun, 15 Dec 2019 16:04:48 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id s1sm19214442wmc.23.2019.12.15.16.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:12 +0100 Message-Id: <20191216000418.24707-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> References: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/16] avformat/hlsenc: Fix return value from localtime_r failure 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" "If an error is detected, localtime_r() shall return a null pointer and set errno to indicate the error." Yet in case this happened in hls_init(), AVERROR(ENOMEM) has been returned. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b3f9582267..669641885e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2747,7 +2747,7 @@ static int hls_init(AVFormatContext *s) char b[15]; struct tm *p, tmbuf; if (!(p = localtime_r(&t, &tmbuf))) - return AVERROR(ENOMEM); + return AVERROR(errno); if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p)) return AVERROR(ENOMEM); hls->start_sequence = strtoll(b, NULL, 10);