ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Netplay) Copy data on receive, even if the buffer is full (#14344)

This commit is contained in:
Cthulhu-throwaway 2022-08-24 11:57:11 -03:00 committed by GitHub
parent 9aef0eff90
commit b59624adc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay_frontend.c
View File

@ -2371,7 +2371,7 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
bool error = false; bool error = false;
if (buf_used(sbuf) >= (sbuf->bufsz - 1)) if (buf_used(sbuf) >= (sbuf->bufsz - 1))
return 0; goto copy;
/* Receive whatever we can into the buffer */ /* Receive whatever we can into the buffer */
if (sbuf->end >= sbuf->start) if (sbuf->end >= sbuf->start)
@ -2415,6 +2415,7 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
} }
/* Now copy it into the reader */ /* Now copy it into the reader */
copy:
if (sbuf->end >= sbuf->read || (sbuf->bufsz - sbuf->read) >= len) if (sbuf->end >= sbuf->read || (sbuf->bufsz - sbuf->read) >= len)
{ {
size_t unread = buf_unread(sbuf); size_t unread = buf_unread(sbuf);
@ -2426,7 +2427,6 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
if (sbuf->read >= sbuf->bufsz) if (sbuf->read >= sbuf->bufsz)
sbuf->read = 0; sbuf->read = 0;
recvd = len; recvd = len;
} }
else if (unread > 0) else if (unread > 0)
{ {
@ -2442,8 +2442,8 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
else else
{ {
/* Our read goes around the edge */ /* Our read goes around the edge */
size_t chunka = sbuf->bufsz - sbuf->read; size_t chunka = sbuf->bufsz - sbuf->read;
size_t chunkb = ((len - chunka) > sbuf->end) ? sbuf->end : size_t chunkb = ((len - chunka) > sbuf->end) ? sbuf->end :
(len - chunka); (len - chunka);
memcpy(buf, sbuf->data + sbuf->read, chunka); memcpy(buf, sbuf->data + sbuf->read, chunka);