github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden stream bounds checks against pointer-arithmetic overflow

Browse Source
This commit is contained in:
Denis Skvortsov
2026-07-25 17:46:28 +03:00
parent a2d130bc5b
commit 5ae11e2a37
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/parse.h
+2 -2
View File
@@ -186,7 +186,7 @@ unsigned int
in_utf16_le_terminated_as_utf8_length(struct stream *s);
/******************************************************************************/
#define s_check_rem(s, n) ((s)->p + (n) <= (s)->end)
#define s_check_rem(s, n) ((n) >= 0 && (n) <= (s)->end - (s)->p)
/******************************************************************************/
/**
@@ -202,7 +202,7 @@ in_utf16_le_terminated_as_utf8_length(struct stream *s);
&& 0 )
/******************************************************************************/
#define s_check_rem_out(s, n) ((s)->p + (n) <= (s)->data + (s)->size)
#define s_check_rem_out(s, n) ((n) >= 0 && (n) <= (s)->size - ((s)->p - (s)->data))
/******************************************************************************/
/**
common/trans.c
+1 -1
View File
@@ -472,7 +472,7 @@ trans_force_read_s(struct trans *self, struct stream *in_s, int size)
if (self->status != TRANS_STATUS_UP ||
size < 0 ||
in_s->end + size > in_s->data + in_s->size)
size > in_s->size - (in_s->end - in_s->data))
{
return 1;
}