From patchwork Sun May 26 20:44:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 13302 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 40F8E4477F3 for ; Sun, 26 May 2019 23:44:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20CD168A3EC; Sun, 26 May 2019 23:44:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCDBB687EC8 for ; Sun, 26 May 2019 23:44:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1558903452; bh=4ZAk1tfKoc1qg4eLe3WAlOxQWrHemU9PePDIxi8e6Jo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PXg1cgJZe7aG77CZt+Ea6kyCZBKXkQvlHqAXLiKbWChNt0eVaLWN1WfxGnwCIZggy JkSGWDN9qgBzvXp2CQvhXv04XEO6mkHUB1k0dpcX7Pz1wssGl/HaoPuWkBgS9P2dxO DCijUCjc3kRiHqIblC0eCbW9wc2K2BPX5FUt4Oy8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.225.110]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Me8ws-1hG3dq0Xeg-00PxlI; Sun, 26 May 2019 22:44:12 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Sun, 26 May 2019 22:44:00 +0200 Message-Id: <20190526204400.27482-1-barsnick@gmx.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <42241cac359c49d836530756db5e57e1b96b9f24.1558627113.git.barsnick@gmx.net> References: <42241cac359c49d836530756db5e57e1b96b9f24.1558627113.git.barsnick@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:nU/Vou9r+oVtLjGotxDbyZzO7j6qHua+sNRec6XX2vZrPzbKFBQ 3T22mvKMIKRbf1P0KsYFOYhywTXjQUSxt94zwOJGRAaV6zS2kXT619Ve00Khv9bMUVYWQLj wwuWrlW+HltOjLDV2AJPwZhtPR9trOH7oO1JYnBiql0pLx4Im+76vwa0tL/Q8mVh6v2FTYs zGQ9Q0tHbdCP0ze0KHjHQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:FDkwgBExcys=:JnVmlHgOjo6v2Uu7sDimex j/b40nRhR097qSdSj7W9mCZQvhXRHj8JfITpPvvCivozXeiMoTRNwJ2OhbCFPF2BTkdXJXVPO CG731vDCu190EQC8lmSK1NBzXasyT/ie0UdKDWy82nK/qNRCANZQg6MR5Heuidqj/R1ejOHSq WHyZNDQXU894WMHzAplKPWDMqorK1sx+fAZNvSovCGWxNJN90u4yhSCvFGB0cWJEjtrIn/4Kq nQ1ckN/prDRaDI30yjrwoy45XAbVfPcqXrwnmRkNUeK3r7tlBGkGqMrl+WBPdilNOOm5B/Zhq Ug2HHexPrvt/3sZtASqtRxNr2THdN+0lW3+IqBf4p8yEDLnzw61FWuBg/+WtRs+n921ueHVRT kmGadAURm1jRvr/VwvoBMBeq7+1OJHzTfaDczTfYu2Ga6AKrq5PEhH0zRFG4NRwCn+O/ZP5ey tX8SaUd9sA7RwsoOlsKpPz0x/OVv4hsprkDQtVdmfCRn7DyVfWAZvfNQadRCnoyQ9HIRYdz8K GdG7K20Ac3y3qQQ2nJo32teH+N0Wvvh8RwZ1kWZ6J38u+zeFZ0YS7aHknautVyxPQCHGKeO81 Ry7pxGqd4tWCfkvp2CVomOC9cjQhHSctyWkbvPcJv1msO10CEZL2fKVal2oJmmq2KqH+JYE3L eVPQ+wl8/aNYgXojb6wXCdi+PF/+CyGpsCh9DZnE995XQZd9MYg6rGa+NCODOI+iWxajnr48s kFy00gLKd9Y4olaRqfpOqPKaXk5j+4wZWbyIn+SccB6gBiyTnoXsY0lYZfULDEJ70h/ljtUT2 7bFFJiBaMRKK4jwAHe1Xz+MTOL70mRq924YucG+xtn/mN5tttT1E/7SNkm2/PiwQplCItYDyu +J79vlHRXJpJuaYDtP5KMOn9iGuC9Or5/cNTbK8k3tSF6sUdjjzBaVc/yoIvD9hZgLXBOfUxI OiaIuVnNLFvbH4KKiKbT3SRDKpjPngS8= Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpjpegdec: fix strict boundary search string 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: Moritz Barsnick Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" According to RFC1341, the multipart boundary indicated by the Content-Type header must be prepended by CRLF + "--", and followed by CRLF. In the case of strict MIME header boundary handling, the "--" was forgotten to add. Fixes trac #7921. Signed-off-by: Moritz Barsnick --- libavformat/mpjpegdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index a23469c0ec..f8741cc3b0 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -306,8 +306,9 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) boundary = mpjpeg_get_boundary(s->pb); } if (boundary != NULL) { - mpjpeg->boundary = boundary; - mpjpeg->searchstr = av_asprintf( "\r\n%s\r\n", boundary ); + mpjpeg->boundary = av_asprintf("--%s", boundary); + mpjpeg->searchstr = av_asprintf("\r\n--%s\r\n", boundary); + av_freep(&boundary); } else { mpjpeg->boundary = av_strdup("--"); mpjpeg->searchstr = av_strdup("\r\n--");