demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-04 02:24:12 +02:00
Code Issues Releases Wiki Activity

harden against dos with crafted input by limiting reserved vec/map size

Browse source
This commit is contained in:
Robin Appelman 2020-01-19 22:13:12 +01:00
commit 3caadadb3b
7 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/demo/message/classinfo.rs
View file

@ -2,6 +2,7 @@ use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
use crate::demo::message::stringtable::log_base2;
use crate::{ReadResult, Stream};
use std::cmp::min;
#[derive(BitReadSized, Debug)]
pub struct ClassInfoEntry {
@ -23,7 +24,7 @@ impl BitRead<LittleEndian> for ClassInfoMessage {
let count: u16 = stream.read()?;
let create: bool = stream.read()?;
let entries = if !create {
let mut entries = Vec::with_capacity(count as usize);
let mut entries = Vec::with_capacity(min(count, 128) as usize);
let bits = log_base2(count);
for _ in 0..count {
entries.push(stream.read_sized(bits as usize)?);

3
src/demo/message/packetentities.rs
View file

@ -8,6 +8,7 @@ use crate::demo::parser::ParseBitSkip;
use crate::demo::sendprop::{SendProp, SendPropDefinition, SendPropValue};
use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
use parse_display::{Display, FromStr};
use std::cmp::min;
use std::collections::HashMap;
use std::fmt;
use std::hint::unreachable_unchecked;
@ -146,7 +147,7 @@ impl Parse for PacketEntitiesMessage {
let updated_base_line = stream.read()?;
let mut data = stream.read_bits(length as usize)?;
let mut entities = Vec::with_capacity(updated_entries as usize);
let mut entities = Vec::with_capacity(min(updated_entries, 128) as usize);
let mut removed_entities = Vec::new();
let mut last_index: i32 = -1;

3
src/demo/message/setconvar.rs
View file

@ -2,6 +2,7 @@ use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
use crate::demo::message::stringtable::log_base2;
use crate::{ReadResult, Stream};
use std::cmp::min;
#[derive(Debug)]
pub struct SetConVarMessage {
@ -11,7 +12,7 @@ pub struct SetConVarMessage {
impl BitRead<LittleEndian> for SetConVarMessage {
fn read(stream: &mut Stream) -> ReadResult<Self> {
let count: u8 = stream.read()?;
let mut vars: Vec<(String, String)> = Vec::with_capacity(count as usize);
let mut vars: Vec<(String, String)> = Vec::with_capacity(min(count, 128) as usize);
for _ in 0..count {
let key = stream
.read()

3
src/demo/message/stringtable.rs
View file

@ -7,6 +7,7 @@ use crate::demo::packet::stringtable::{
};
use crate::demo::parser::ParseBitSkip;
use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
use std::cmp::min;
#[derive(Debug)]
pub struct CreateStringTableMessage {
@ -149,7 +150,7 @@ struct TableEntries {
impl TableEntries {
pub fn new(count: usize) -> Self {
TableEntries {
entries: Vec::with_capacity(count),
entries: Vec::with_capacity(min(count, 128)),
history: Vec::with_capacity(32),
}
}