From patchwork Thu Feb 7 13:40:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11984 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 14045445214 for ; Thu, 7 Feb 2019 15:40:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E836B68A87A; Thu, 7 Feb 2019 15:40:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f182.google.com (mail-it1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C0A468A773 for ; Thu, 7 Feb 2019 15:40:44 +0200 (EET) Received: by mail-it1-f182.google.com with SMTP id i145so14797147ita.4 for ; Thu, 07 Feb 2019 05:40:43 -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=HtENLlJtOFHuAzl1r2eGJVNq7OeG/srUHyAr6FBvqSI=; b=UHbJh7k4YmETabpTDJogTGwLP70xKBOPrETL3n2a3sWbVMuwH6AC3lT1KUkDdyxQrh h+lozRSd0GJFH+B22QpjT1uyHt7JscuwBNCgc0wih9wFzD2SRRVNjnQm5Qr0uhFtiYtb YeTscKw6lqRt/NgPiYA+mcdjozWwiqi1NEBsWUebBE3vuvTQLyqHlvUyN5X/Gd21ybaP 4fDXhJi9Rcm/op488YvgJTPFKrMNZCE+8nfoUOJX0wdihpqDpYnhVmnmae1aq4TfMn6x anICqSIBfwOsAFsmZJvX4CTVlXH0QA43JXw0byvkws8ZHKGsZtpC/Ss74TrG/PwA+Kx7 Arpg== 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=HtENLlJtOFHuAzl1r2eGJVNq7OeG/srUHyAr6FBvqSI=; b=aabmn6TUbKdji7spIFqXKL/vsfKAXxQrrYx3g+eQJDD9XXLBjkMbATtzKoCrM+5Jp/ /gxUAyEszuWg+H8+5hhBlEOKBmnvf1x81pRP45xKw9dBpLaNm6ma97oTtje17+YxJrEr pFpw2B2/pvw4aZRGupmWRu79pSHTCcHaPYZkQSdOSLOJOCngU5RjE7/bLlEEaqpaN0zQ lqAm1NmmaghTV0xQHnOFejeE+PJezf1F0inWdzPu2yOPb+Sta2EFolKbDLWN4q+5QXgZ 88kWHv+uYOoySwejJra48WgJucFA8MlR0nXXMsZaihvCFJezWvvhtDmo1FgBBLdW7OXo rJcg== X-Gm-Message-State: AHQUAuZ5waC0UikcroztBhEp+Su7NywyMlz5+hygO66AJE+wSv7HtaJS ikPVxDqP32X2nwSmrcu3DbMjMKqVz4u0ZDMip3L8UA== X-Google-Smtp-Source: AHgI3Ib7lZ8MH+N450v855OaEYuRg6rkXQxOArhM0h4ch6TdR/VTUBhBYVOZsuP4tTOUMGycSPbzgVxSghZCor4Ngh4= X-Received: by 2002:a5d:9685:: with SMTP id m5mr544608ion.55.1549546841898; Thu, 07 Feb 2019 05:40:41 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:c890:0:0:0:0:0 with HTTP; Thu, 7 Feb 2019 05:40:40 -0800 (PST) From: Carl Eugen Hoyos Date: Thu, 7 Feb 2019 14:40:40 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/mpegts: Do not print the character coding as part of service name 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" Hi! Attached patch fixes ticket #6320 as reported. Please comment, Carl Eugen From 6a26ae786194275242de8870d2de3dad6c740405 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 7 Feb 2019 14:37:48 +0100 Subject: [PATCH] lavf/mpegts: Do not print the character coding as part of service name. Fixes ticket #6320. --- libavformat/mpegts.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b04fd7b..18130aa 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -674,6 +674,11 @@ static char *getstr8(const uint8_t **pp, const uint8_t *p_end) return NULL; if (len > p_end - p) return NULL; + if (p[0] < 0x20) { + p++; + if (--len < 0) + return NULL; + } str = av_malloc(len + 1); if (!str) return NULL; -- 1.7.10.4