projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rocksndiamonds-3.3.1.0
[rocksndiamonds.git]
/
src
/
libgame
/
misc.c
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index 7051e28efa9f2a0379bd4cf67ac61a6797d47136..60dbcf068c20e9d84a29a6d4de15356d1ce15892 100644
(file)
--- a/
src/libgame/misc.c
+++ b/
src/libgame/misc.c
@@
-458,7
+458,7
@@
char *getLoginName()
#if defined(PLATFORM_WIN32)
if (login_name == NULL)
{
#if defined(PLATFORM_WIN32)
if (login_name == NULL)
{
- unsigned
int
buffer_size = MAX_USERNAME_LEN + 1;
+ unsigned
long
buffer_size = MAX_USERNAME_LEN + 1;
login_name = checked_malloc(buffer_size);
if (GetUserName(login_name, &buffer_size) == 0)
login_name = checked_malloc(buffer_size);
if (GetUserName(login_name, &buffer_size) == 0)
@@
-487,7
+487,7
@@
char *getRealName()
if (real_name == NULL)
{
static char buffer[MAX_USERNAME_LEN + 1];
if (real_name == NULL)
{
static char buffer[MAX_USERNAME_LEN + 1];
- unsigned
int
buffer_size = MAX_USERNAME_LEN + 1;
+ unsigned
long
buffer_size = MAX_USERNAME_LEN + 1;
if (GetUserName(buffer, &buffer_size) != 0)
real_name = get_corrected_real_name(buffer);
if (GetUserName(buffer, &buffer_size) != 0)
real_name = get_corrected_real_name(buffer);
@@
-1193,7
+1193,8
@@
boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size,
const int chunk_name_length = 4;
/* read chunk name */
const int chunk_name_length = 4;
/* read chunk name */
- fgets(chunk_name, chunk_name_length + 1, file);
+ if (fgets(chunk_name, chunk_name_length + 1, file) == NULL)
+ return FALSE;
if (chunk_size != NULL)
{
if (chunk_size != NULL)
{