Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ impl Parser {
/// put the parser in the error state.
pub fn finish(&mut self) {
match self.state {
// If the parser is one of the initial states, simply jump to finish
STATE_START | STATE_REQUEST_LINE | STATE_STATUS_LINE | STATE_FINISH => {
// An untouched or already finished parser can finish cleanly.
STATE_START | STATE_FINISH => {
self.state = STATE_FINISH;
}
STATE_BODY_WITH_NO_LENGTH => {
Expand Down
18 changes: 17 additions & 1 deletion parser/tests/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mod helpers;
use std::ffi::c_uchar;

use milo_parser::{
CALLBACK_ACTIVE_ON_HEADERS, ERROR_NONE, ERROR_UNEXPECTED_CHARACTER, ERROR_UNEXPECTED_STATE,
CALLBACK_ACTIVE_ON_HEADERS, ERROR_NONE, ERROR_UNEXPECTED_CHARACTER, ERROR_UNEXPECTED_EOF, ERROR_UNEXPECTED_STATE,
EVENT_ACTIVE_ON_HEADER_NAME, EVENT_ACTIVE_ON_HEADER_VALUE, STATE_BODY_DECISION, STATE_ERROR, STATE_FINISH,
STATE_HEADER, STATE_START,
};
Expand Down Expand Up @@ -678,6 +678,22 @@ fn basic_finish_logic() {
assert_eq!(parser.state, STATE_HEADER);
parser.finish();
assert_eq!(parser.state, STATE_ERROR);

parser.reset(false);
let partial_request = b"G";
assert_eq!(parser.parse(partial_request.as_ptr(), partial_request.len()), 0);
parser.finish();
assert_eq!(parser.state, STATE_ERROR);
assert_eq!(parser.error_code, ERROR_UNEXPECTED_EOF);

parser.reset(false);
parser.autodetect = false;
parser.is_request = false;
let partial_response = b"HTTP";
assert_eq!(parser.parse(partial_response.as_ptr(), partial_response.len()), 0);
parser.finish();
assert_eq!(parser.state, STATE_ERROR);
assert_eq!(parser.error_code, ERROR_UNEXPECTED_EOF);
}

#[test]
Expand Down
14 changes: 14 additions & 0 deletions parser/wasm/test/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,20 @@ it('basic_finish_logic', t => {
assert.equal(milo.getState(parser), milo.STATE_HEADER)
milo.finish(parser)
assert.equal(milo.getState(parser), milo.STATE_ERROR)

milo.reset(parser, false)
assert.equal(parse('G'), 0)
milo.finish(parser)
assert.equal(milo.getState(parser), milo.STATE_ERROR)
assert.equal(milo.getErrorCode(parser), milo.ERROR_UNEXPECTED_EOF)

milo.reset(parser, false)
milo.setShouldAutodetect(parser, false)
milo.setIsRequest(parser, false)
assert.equal(parse('HTTP'), 0)
milo.finish(parser)
assert.equal(milo.getState(parser), milo.STATE_ERROR)
assert.equal(milo.getErrorCode(parser), milo.ERROR_UNEXPECTED_EOF)
})

it('basic_empty_fields', t => {
Expand Down
Loading