Skip to content

N
nx-libs
Unverified Commit c478ba29 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-pr/fix_bigrequests' into 3.6.x

Attributes GH PR #729: https://github.com/ArcticaProject/nx-libs/pull/729
parents d3bbca71 da9d1a52
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
nx-X11/programs/Xserver/os/io.c
View file @ c478ba29
...@@ -301,7 +301,8 @@ ReadRequestFromClient(ClientPtr client) ...@@ -301,7 +301,8 @@ ReadRequestFromClient(ClientPtr client)
*/ */
oci->lenLastReq = 0; oci->lenLastReq = 0;
if (needed > MAXBUFSIZE) #ifdef BIGREQS
if (needed > maxBigRequestSize << 2)
{ {
/* request is too big for us to handle */ /* request is too big for us to handle */
/* /*
...@@ -312,6 +313,7 @@ ReadRequestFromClient(ClientPtr client) ...@@ -312,6 +313,7 @@ ReadRequestFromClient(ClientPtr client)
oci->lenLastReq = gotnow; oci->lenLastReq = gotnow;
return needed; return needed;
} }
#endif
if ((gotnow == 0) || if ((gotnow == 0) ||
((oci->bufptr - oci->buffer + needed) > oci->size)) ((oci->bufptr - oci->buffer + needed) > oci->size))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment