lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use memmove in D_MD5PasswordPass() and drop noreturn

Browse source
This commit is contained in:
Alam Ed Arias 2016-05-28 19:42:38 -04:00
parent 35f36e1bba
commit d9aa430817
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -2601,7 +2601,7 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
if (len > 256-strlen(salt)) if (len > 256-strlen(salt))
len = 256-strlen(salt); len = 256-strlen(salt);
memcpy(tmpbuf, buffer, len); memmove(tmpbuf, buffer, len);
strcpy(&tmpbuf[len], salt); strcpy(&tmpbuf[len], salt);
len += strlen(salt); len += strlen(salt);
if (len < 256) if (len < 256)

4
src/sdl/i_main.c
View file

@ -144,10 +144,8 @@ void XBoxStartup()
myargv = NULL; myargv = NULL;
#else #else
#ifdef FORCESDLMAIN #ifdef FORCESDLMAIN
FUNCNORETURN
int SDL_main(int argc, char **argv) int SDL_main(int argc, char **argv)
#else #else
FUNCNORETURN
int main(int argc, char **argv) int main(int argc, char **argv)
#endif #endif
{ {
@ -245,8 +243,6 @@ int main(int argc, char **argv)
#endif #endif
// return to OS // return to OS
#if !defined (__GNUC__)
return 0; return 0;
#endif
} }
#endif #endif