From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1B64220A1E; Fri, 7 Dec 2018 23:56:25 +0000 (UTC) Date: Fri, 7 Dec 2018 23:56:24 +0000 From: Eric Wong To: cmogstored-public@bogomips.org Subject: [PATCH 2/1] http_parser: workaround parsing OOM in Ragel 6.10 Message-ID: <20181207235624.auo2azxknpwhcvtu@dcvr> References: <20181127095936.30796-1-e@80x24.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181127095936.30796-1-e@80x24.org> List-Id: Noticed in FreeBSD 11.2 where Ragel 6.10 was OOM-ing, this doesn't affect Ragel 6.9. TODO: make sure this is fixed upstream in Ragel. --- http_parser.rl | 10 +++++----- path_parser.rl | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/http_parser.rl b/http_parser.rl index 4ecb97a..e07aea8 100644 --- a/http_parser.rl +++ b/http_parser.rl @@ -48,16 +48,16 @@ static char *skip_header(struct mog_http *http, char *buf, const char *pe) DELETE = "DELETE "> { http->_p.http_method = MOG_HTTP_METHOD_DELETE; }; MKCOL = "MKCOL "> { http->_p.http_method = MOG_HTTP_METHOD_MKCOL; }; - mog_fs_path = (mog_path) > { http->_p.path_tip = to_u8(fpc - buf); } + mog_path_start = '/' > { http->_p.path_tip = to_u8(fpc - buf); }; # TODO: maybe folks use query string/fragments for logging... - (" HTTP/1.") > { http->_p.path_end = to_u8(fpc - buf); }; - - usage_path = ('/' devid "usage HTTP/1.") @ { http->_p.usage_txt = 1; }; + mog_path_end = (" HTTP/1.") > { http->_p.path_end = to_u8(fpc - buf); }; + usage_path = ("usage HTTP/1.") @ { http->_p.usage_txt = 1; }; # no HTTP/0.9 for now, sorry (not :P) req_line = (HEAD|GET|PUT|DELETE|MKCOL) ("http://" [^/]+)? - '/'*(usage_path | mog_fs_path) + '/'* mog_path_start devid? (usage_path | + (mog_path_rest mog_path_end) ) ('0'|'1'> { http->_p.persistent = 1; }) '\r'LF; content_length = "Content-Length:"i sep diff --git a/path_parser.rl b/path_parser.rl index 4f0b3ec..974b6c6 100644 --- a/path_parser.rl +++ b/path_parser.rl @@ -17,5 +17,6 @@ } '/'; # only stuff MogileFS will use - mog_path = '/' (devid)? [a-zA-Z0-9/\.\-]{0,36}; + mog_path_rest = [a-zA-Z0-9/\.\-]{0,36}; + mog_path = '/' (devid)? mog_path_rest; }%%