From patchwork Thu May 23 16:06:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 13257 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 5D03B44986E for ; Thu, 23 May 2019 19:09:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 393D968A62D; Thu, 23 May 2019 19:09:36 +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.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40590688369 for ; Thu, 23 May 2019 19:09:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1558627768; bh=3eq2wvkRfltvlgIMzwDsD0CjU/RWq4H31YlreQEXCus=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=MVP1DcwefEfhtZd5WLCMcXWiig/hCWm2MpdayRXlE+Bjb/lDjh8E2j+bwkyJH6ysR TtsJvMVrXRsvHz3a86vS5sBif1IKlypDhUCFDTH5pHnSPjPpdHBXUz0HFXphVwS6uM TQaq0ppNg6PXmvFldYk3MWRxh1c9Y23pkGsiJwJY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.224.166]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MCfcc-1hKWsM1zc2-009RHs; Thu, 23 May 2019 18:09:28 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Thu, 23 May 2019 18:06:43 +0200 Message-Id: <42241cac359c49d836530756db5e57e1b96b9f24.1558627113.git.barsnick@gmx.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:ftleJ5bJgomW6WBroCtRJlgSCR2fs/RH8e6eUakO7cyVnNXA9Yr 6a7aqPJ65A0k0ejohyITeY/oqfQgUz5Pc35XV4utSxIsmaY+txdsJgZtSDtnGt3TJJJYpx7 dlcAmgAQNOG20c/rlMBsZKU97GbZYeyW8ObEaA1BFr8TjbPsZBC7EH+K9l/iq2b2InN5rGz xPNL9ODLsK0n5EWYxthEg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:5elNBA1pzBc=:Y+r6LXfOT64ZnmWwdC5ZOq KX1+llACgj6ATZGypGx7wo+6ix0vrj4CkRHXXMIgWE31YS4jhd511HiwlGE8UTnjk7bGBHx77 3TdnXNkqfudJoQESPfzbI4jiRR2B5cmngmW8TfXY4Q26XWJ+AL3bwbl+M52CT94bGDEgEWR8k J36kyvBlrKgQ/I+Xr/vX2F6JmNYwNCADXdNH67xlkivHDVPjQuO0lnVY2KRod3ez+1SjGDvin kCWRUom1BipcUiQmBCKyEZeRAn+GOib7qZB2fWW2lUKJ6Zp1Ow3r8PQbzpTW08SPTbrlk6H0b qYAZjR6+4RcEAj1WOXRC4N39gcuuXvcMI12nrte7ssI9LsVGxfVqSlTjha4Z839CJQEb7bviN A0ijjdfOLZr34dZxeXkD6O9d9NJUs2HkXg7iObtVhOqBeSiBdLHZqy++03GbbI7W674fDrNVM fUuIGq74XKzVAHE39QPeIpbxdXcs1AVwCCmQa0Q9mZM25waagwtXA2MDEdkmCxMrb48rjThxt MBsE489UO7tLcFU3YP/AHCn7SxDD1wbwX7q1aYtm2T1VMxwgXG4w+c3dCcsKNHVsnbMXWOzTP kCtdn+IrpUcxRqHtTfeS+uEtIC1xfUCNhipLQrs+2nJpu/ZWL3YBeeLWxA95t7Wxd/DnLuXcL us+NjUTCAcQBcegBeK4a0/2yus0mG1Z6VBnOlwflBZlsXWQizgCW9otmGyLoW/SOMFalmsXy7 f1CB5uGo52y9TK3B6i7gTXMvccEf1d3rvDa5pkFtUcEbhqXphgtLvep8y3YV9TjqrcKfgCXdZ TM/TdoXaccS9Y+S3cg/aonnJH1yFLbbGS5LVBNnVzfssgEfa/YqBrVT4EXs9Mr3Axx44aOTRD QQ49zd4PPqXb+9U6Cu0qHQsB2ac9pWTQ0L/6V4pGg6zWagxtfvrL6KttogkZ5agxCv0uffNDF OF2Zuvg7NdgKUB21ufkTrt/relIgp+HY= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index a23469c0ec..f145766e6e 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -306,8 +306,8 @@ 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); } else { mpjpeg->boundary = av_strdup("--"); mpjpeg->searchstr = av_strdup("\r\n--");