Skip to content

libvncserver: read HTTP files in aligned chunks #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcofortina wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −1
Open

libvncserver: read HTTP files in aligned chunks #711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/libvncserver/httpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
unsigned int maxFnameLen;
FILE* fd;
rfbBool performSubstitutions = FALSE;
size_t bytesToRead;
char str[256+32];
#ifndef WIN32
char* user=getenv("USER");
Expand Down Expand Up @@ -484,8 +485,12 @@ if(rfbScreen->httpEnableProxyConnect) {
/* end the header */
rfbWriteExact(&cl, "\r\n", 2);

/* .vnc substitutions need one byte for NUL termination. Other
HTTP files can use the full, aligned buffer. */
bytesToRead = performSubstitutions ? BUF_SIZE - 1 : BUF_SIZE;

while (1) {
int n = fread(buf, 1, BUF_SIZE-1, fd);
int n = fread(buf, 1, bytesToRead, fd);
if (n < 0) {
rfbLogPerror("httpProcessInput: read");
fclose(fd);
Expand Down
Loading