From patchwork Tue Feb 18 15:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mostafa namazi X-Patchwork-Id: 17832 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 6D6CA44B9A5 for ; Tue, 18 Feb 2020 17:39:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42341688121; Tue, 18 Feb 2020 17:39:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AAA4687F19 for ; Tue, 18 Feb 2020 17:39:35 +0200 (EET) Received: by mail-ot1-f68.google.com with SMTP id r16so19946586otd.2 for ; Tue, 18 Feb 2020 07:39:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=BG/+Xcn7k2DUmIEgagGjvyMEHe/92Q7ZfVQmTMYVwis=; b=HqpdQEKiNjANx6KSveliylAnpXuyW9GDRY94ftuhv7IJUZjeTfprnBq8H6dOFRe7mW I1ZNWqC0EZvuezTbGVOn7L5jIzGNA2YDCzS/ZUHyKCmdbDKgtQH2XxyfNvz9+5eUghHo rs+nZuyrC9HmEah+RFmcBcYoo1OHF8gz8M0xFdJLgnYMx3/1z2SnqCP0W2ry/BAzmjd+ 6Q9G4EhN5gCsG948U2UUixXjlnulnNO/gE/ENvAe9cB6S5WrAvGCJ/AkwbRuEVLodt9L dZzjxRNOpm1POZ4dAb7vvbv9ojh3bKmYqBmnPQ3fCVGkf6yRCv/ZSSymt/4/3Xd5HOuq +J2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=BG/+Xcn7k2DUmIEgagGjvyMEHe/92Q7ZfVQmTMYVwis=; b=ZGv6k06KjW8Bw+S9HDJjDifSV7XW0gYdOw3he5/N6yKH98/QxcspiQQ8kmRjn9Q78x 28kF1JV75Hca8VXBAZYyaaE8i4gOBELw8js6heaDqayAzbq+QnSUGhRUBaccEAyMdUAA 597nzVOK/H9Yq3P8nIVejQCT9USOuxmcUQknQdtw2Oc6MaySFklu4uxvzo5KfaPP8aIx +1w9Z0gxWkqCv4shR3q1NqNam+Y4+5TsG5Z9eepc/vQHWlxxCP/uvNxTl1nGGX/JyraH HvMlh3STFSFNSKS4z33hEudakb9JrEaKv4SRstRzBMyA2/5jFYo5FkO7AQUZ+WEG4K2j M4AQ== X-Gm-Message-State: APjAAAVMXDQeE5YSGK2LzbEJGQMO0uOx8ejNm7LwuBngcC7pujuTyd8m ZcvHc4qaNVEDW58Y9/KjrrDRdOYaNPot1OWUwZP+Bmz3nSQ= X-Google-Smtp-Source: APXvYqwqzXD6tmIUtq6tS8rXlyppFmu/9tUhLtSGCRs+vmNKxEQ49MH0So4JleFON1er/c8xLtjqDWNKI+GYnBv2r08= X-Received: by 2002:a9d:24c8:: with SMTP id z66mr16457000ota.52.1582038679470; Tue, 18 Feb 2020 07:11:19 -0800 (PST) MIME-Version: 1.0 From: Mostafa Namazi fard Date: Tue, 18 Feb 2020 18:41:08 +0330 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] new patch 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" I found this patch useful for prevent crash in http live stream. I'm using ffmpeg in my application for show http live when remote address send invalid data ffmpeg crash in this part and after my change it was fixed. From 73c61670d6e65ad9f7a354a785f73ff9ad5ffc12 Mon Sep 17 00:00:00 2001 From: Mostafa Namazi Date: Tue, 18 Feb 2020 16:14:16 +0330 Subject: [PATCH] crash fixed: live stream. --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 1f58e745a7..97b1a1db52 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2110,7 +2110,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) /* Make sure we've got one buffered packet from each open playlist * stream */ if (pls->needed && !pls->pkt.data) { - while (1) { + while (pls->ctx) { int64_t ts_diff; AVRational tb; ret = av_read_frame(pls->ctx, &pls->pkt); -- 2.17.1