From patchwork Sun Oct 6 22:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 15534 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 B4305448ACD for ; Mon, 7 Oct 2019 01:19:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A011A687FE6; Mon, 7 Oct 2019 01:19:50 +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.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3F0E680908 for ; Mon, 7 Oct 2019 01:19:43 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1570400383; bh=ZGVXMgkozZmbeVHONzyoY3IKwbkoIC6jkz/aV7HSJys=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eauaBlcRXCw/nE+Ble07Jy64rdoiLJk6a4SrTpmbGumaRKB0KGbPZ5CGzxrOyTu1Y mnsArWJ83I10N9ycLrtggsRoSq0iT06I/YH4pRDQ4ifWmJKVdP0vCqV2AsZP5zReAn s3PXtrne/xk6BVutruAj2FvABGzInFNLKGGMvb9E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.225.10]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MORAa-1iSjZo46l4-00Pqni; Mon, 07 Oct 2019 00:19:43 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Mon, 7 Oct 2019 00:19:29 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: <70a15566835b8a83cf98921ca23b382937348e23.1570398124.git.barsnick@gmx.net> References: <70a15566835b8a83cf98921ca23b382937348e23.1570398124.git.barsnick@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:T4PxEKhnxLFxai2ogm4nhI2PRKQxdwOwR/CoA4ITyfXmIvX50hY gwKgj4W1xI5jF189Yq0kRSVlNHyDFOUXjCc9pMdYH5/ICj5HXdJKXtgsf98mGYscWTkYMrz QRDCiGz/T8Ge5Ty/z+qg0AfOWNn72k2eqZ6Rsv8y2j3kOyFDi1/vzMqc1OhvKGrpn8QY8Tp u8BtdscTCbMeu5BBYJevw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:6E6di+lxQwI=:N9eCXynyoVIK+zLBT39oHt n+JeVVPKsLhoLGm7H7IytT35Cxp2AplmqJv9svKKh+DqXiASzlrIsB3wB/IBCl9ttS8HRvRSp for7sMDnsDcDDMyjGtgDRcW2jzEYtfcqJZKro+I6QdP0VEm/BvGBEUVkXSuQdPFJQLGspCk8c mLc+0fBxUjFjApsBXZv/8n6qf5ueMVbaOQ/sgFxcDp1lelmYWNJjIR7tS0jj/XIGaWNZuKm8e cyUPgAq/Eprk/PufTGrE03t7fF24TdqvHBwnf7KDTG1nxBhuYtGNtriNl/o6Ruxm7cAHlL3Oy 0V6hli0O61WddbTsVF2OtMVPQum2XZ+LMAKH3q/XzOJT/eARHOqAyUUxePhYxIRzPFWzDuiWb aOW1IJEg6K2ilmK7JdeX1H5NF0x1ETQkO+/6hGcD1hDvU4TLQVYcpWLGgdZLymwj2zf1+eMLP 2gOOFtl2WabYd8p/4DLqs1NGCvYr68n/ZFt0NEEdvd+lJKIFqxoepwu9XH+qYh6eISdxbT9tC Yxa7APgQ57LscKKgw7tomU+b0LC9FWQHDWU5X2Y0oQnjR8dW/cA4cC0LYyuYwddIlAiemx/iD RfnCEx3/I8FuTP33FeIICkurLbSmu/pdRIyfy++V0Lnof9t19s+FTe3Q9jRKZAXjIeF/tNNSo v8TdTTgnJBCyMhsacnqocKlaB8Qluvx9EbF1K3N3df2mM62aJIEEZGTcH2OFzFQFyt45fNPi2 8OeofiuVs299Vs8SaKXrGbzkHIKPa5eKG8oebDcejxqB0HOioVROgNKdMNIADNJP5b5zc6rXN KD0/dvGUQ4ROfZR9e8Fa/F9hNixpCm7jEkUzoMHu7l4tknGo4inzqFArbMZfBToy8ikIFQ/D1 8md8yItGhpRCsdgiCndJK905e0KFRGo53gYJwdQYKQj2atKjJ/FU1rc+oRVwjehFaEzcSIP63 LIcIgcM2Y5zCMaQqfyFxGlWxOsGs3XHnMtYjRUyijArc7y6V8yzF+/E8BiJaAHy1JNiXruQse RARfB/5wtbpWQy62knSkORjIzQUjp7fySuLYw/eXIwudeuNLtNjZRaY9QS7U0wKMUmrQ+Dyyt kkC4ImWp8m9gr7aZbTZT8v4Oex5jSeZBxmU82r3mN/3Kjhb++epBxjBWEUTjI30fYZa0VhChh W18mj89Db0DBJj+tXImzoBr2xC6fyUvguNERYZAeas4+hKC3JvzcwhncbirZinioMORICaCoz 8X4m9qIT1i++51CmD1dmpPdcu1Jeclyc7vYjTWg== Subject: [FFmpeg-devel] [PATCH v3 2/3] 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. A side effect is that this coincidentally breaks enforcement of strict MIME headers against servers running motion < 3.4.1, where the boundary announcement in the HTTP headers incorrectly used the prefix "--", which exactly matched this bug's behavior. 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 c0ffaf616e..24bf232db2 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -302,8 +302,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--");