http2: fix leak with range files

Ticket: #5808

May have been introduced by a24d7dc45c

Function http2_range_open expects to be called only when
tx.file_range is nil. One condition to ensure this is to check
that we are beginning the files contents. The filetracker field
file_open is not fit for this, as it may be reset to false.
pull/8459/head
Philippe Antoine 4 years ago committed by Victor Julien
parent a0fc00bb48
commit ba99241957

@ -85,6 +85,10 @@ impl FileTransferTracker {
!self.file_open !self.file_open
} }
pub fn is_initialized(&self) -> bool {
return self.file_open || self.file_is_truncated;
}
fn open(&mut self, config: &'static SuricataFileContext, name: &[u8]) -> i32 fn open(&mut self, config: &'static SuricataFileContext, name: &[u8]) -> i32
{ {
let r = self.file.file_open(config, self.track_id, name, self.file_flags); let r = self.file.file_open(config, self.track_id, name, self.file_flags);

@ -219,7 +219,8 @@ impl HTTP2Transaction {
let xid: u32 = self.tx_id as u32; let xid: u32 = self.tx_id as u32;
if dir == Direction::ToClient { if dir == Direction::ToClient {
self.ft_tc.tx_id = self.tx_id - 1; self.ft_tc.tx_id = self.tx_id - 1;
if !self.ft_tc.file_open { // Check that we are at the beginning of the file
if !self.ft_tc.is_initialized() {
// we are now sure that new_chunk will open a file // we are now sure that new_chunk will open a file
// even if it may close it right afterwards // even if it may close it right afterwards
self.tx_data.incr_files_opened(); self.tx_data.incr_files_opened();

Loading…
Cancel
Save