aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/botlib/l_precomp.c6
-rw-r--r--code/client/cl_main.c2
-rw-r--r--code/client/qal.c4
-rw-r--r--code/unix/unix_main.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
index 49f13ff..74276a4 100644
--- a/code/botlib/l_precomp.c
+++ b/code/botlib/l_precomp.c
@@ -469,9 +469,9 @@ int PC_StringizeTokens(token_t *tokens, token_t *token)
strcat(token->string, "\"");
for (t = tokens; t; t = t->next)
{
- strncat(token->string, t->string, MAX_TOKEN - strlen(token->string));
+ strncat(token->string, t->string, MAX_TOKEN - strlen(token->string) - 1);
} //end for
- strncat(token->string, "\"", MAX_TOKEN - strlen(token->string));
+ strncat(token->string, "\"", MAX_TOKEN - strlen(token->string) - 1);
return qtrue;
} //end of the function PC_StringizeTokens
//============================================================================
@@ -1015,7 +1015,7 @@ int PC_Directive_include(source_t *source)
break;
} //end if
if (token.type == TT_PUNCTUATION && *token.string == '>') break;
- strncat(path, token.string, MAX_PATH);
+ strncat(path, token.string, MAX_PATH - 1);
} //end while
if (*token.string != '>')
{
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 8739fd1..598f3be 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -2869,7 +2869,7 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
if (strlen(info)) {
if (info[strlen(info)-1] != '\n') {
- strncat(info, "\n", sizeof(info));
+ strncat(info, "\n", sizeof(info) - 1);
}
Com_Printf( "%s: %s", NET_AdrToString( from ), info );
}
diff --git a/code/client/qal.c b/code/client/qal.c
index 0701c5d..cfef944 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -176,8 +176,8 @@ qboolean QAL_Init(const char *libname)
#else
char fn[1024];
getcwd(fn, sizeof(fn));
- strncat(fn, "/", sizeof(fn));
- strncat(fn, libname, sizeof(fn));
+ strncat(fn, "/", sizeof(fn) - strlen(fn) - 1);
+ strncat(fn, libname, sizeof(fn) - strlen(fn) - 1);
if( (OpenALLib = OBJLOAD(fn)) == 0 )
{
diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c
index c432026..7f4b65c 100644
--- a/code/unix/unix_main.c
+++ b/code/unix/unix_main.c
@@ -1236,7 +1236,7 @@ void Sys_ANSIColorify( const char *msg, char *buffer, int bufferSize )
if( msg[ i ] == '\n' )
{
Com_sprintf( tempBuffer, 7, "%c[0m\n", 0x1B );
- strncat( buffer, tempBuffer, bufferSize );
+ strncat( buffer, tempBuffer, bufferSize - 1);
i++;
}
else if( msg[ i ] == Q_COLOR_ESCAPE )
@@ -1258,7 +1258,7 @@ void Sys_ANSIColorify( const char *msg, char *buffer, int bufferSize )
if( escapeCode )
{
Com_sprintf( tempBuffer, 7, "%c[%sm", 0x1B, escapeCode );
- strncat( buffer, tempBuffer, bufferSize );
+ strncat( buffer, tempBuffer, bufferSize - 1);
}
i++;
@@ -1267,7 +1267,7 @@ void Sys_ANSIColorify( const char *msg, char *buffer, int bufferSize )
else
{
Com_sprintf( tempBuffer, 7, "%c", msg[ i++ ] );
- strncat( buffer, tempBuffer, bufferSize );
+ strncat( buffer, tempBuffer, bufferSize - 1);
}
}
}