From 3366e11bbdb586679227494f389039e6d58f8e0e Mon Sep 17 00:00:00 2001
From: Andrey Nazarov <skuller@skuller.net>
Date: Wed, 24 Sep 2008 16:24:46 +0000
Subject: Com_sprintf -> Q_snprintf, Q_strncpyz -> Q_strlcpy, Q_strcat ->
 Q_strlcat. Q_vsnprintf, Q_sprintf, Q_concat, Q_strlcpy, Q_strcat all return
 number of characters to be written into the buffer regardless of overflow.
 Removed COM_AppendExtension, FS_CopyFile, FS_RemoveFile, FS_CopyFile_f. Made
 sure Q2PRO can only write files into subdirectories of the game directory
 with a fixed extension. Moved `play' command implementation into main client
 code. Added support for `s_ambient' value of 3. Renamed `net_log_active' cvar
 to `net_log_enable'. Log files are now written into `logs/' subdirectory.

---
 source/sys_unix.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'source/sys_unix.c')

diff --git a/source/sys_unix.c b/source/sys_unix.c
index 0798c96..7c1a606 100644
--- a/source/sys_unix.c
+++ b/source/sys_unix.c
@@ -237,13 +237,15 @@ void Sys_ConsoleOutput( const char *string ) {
 
 void Sys_SetConsoleTitle( const char *title ) {
     char buffer[MAX_STRING_CHARS];
-    int len;
+    size_t len;
 
 	if( !tty_enabled ) {
         return;
     }
-    len = Com_sprintf( buffer, sizeof( buffer ), "\033]0;%s\007", title );
-    Sys_ConsoleWrite( buffer, len );	
+    len = Q_snprintf( buffer, sizeof( buffer ), "\033]0;%s\007", title );
+    if( len < sizeof( buffer ) ) {
+        Sys_ConsoleWrite( buffer, len );	
+    }
 }
 
 /*
@@ -824,7 +826,7 @@ static void Sys_ListFilteredFiles(  void        **listedFiles,
                                     const char  *path,
                                     const char  *filter,
                                     int         flags,
-                                    size_t      length,
+                                    size_t      baselen,
                                     int         depth )
 {
 	struct dirent *findInfo;
@@ -832,6 +834,7 @@ static void Sys_ListFilteredFiles(  void        **listedFiles,
     struct  stat st;
 	char	findPath[MAX_OSPATH];
 	char	*name;
+    size_t  len;
 
     if( depth >= 32 ) {
         return;
@@ -852,8 +855,11 @@ static void Sys_ListFilteredFiles(  void        **listedFiles,
         if( !strcmp( findInfo->d_name, ".." ) ) {
             continue;
         }
-        Q_concat( findPath, sizeof( findPath ),
+        len = Q_concat( findPath, sizeof( findPath ),
             path, "/", findInfo->d_name, NULL );
+        if( len >= sizeof( findPath ) ) {
+            continue;
+        }
 
         if( stat( findPath, &st ) == -1 ) {
             continue;
@@ -861,7 +867,7 @@ static void Sys_ListFilteredFiles(  void        **listedFiles,
 
 		if( st.st_mode & S_IFDIR ) {
 			Sys_ListFilteredFiles( listedFiles, count, findPath,
-                filter, flags, length, depth + 1 );
+                filter, flags, baselen, depth + 1 );
 		}
 
 		if( ( flags & FS_SEARCHDIRS_MASK ) == FS_SEARCHDIRS_ONLY ) {
@@ -874,11 +880,11 @@ static void Sys_ListFilteredFiles(  void        **listedFiles,
 			}
 		}
 
-		if( !FS_WildCmp( filter, findPath + length ) ) {
+		if( !FS_WildCmp( filter, findPath + baselen ) ) {
 			continue;
 		}
         if( flags & FS_SEARCH_SAVEPATH ) {
-    		name = findPath + length;
+    		name = findPath + baselen;
         } else {
             name = findInfo->d_name;
         }
@@ -907,7 +913,7 @@ Sys_ListFiles
 void **Sys_ListFiles(   const char  *path,
                         const char  *extension,
                         int         flags,
-                        size_t      length,
+                        size_t      baselen,
                         int         *numFiles )
 {
 	struct dirent *findInfo;
@@ -917,6 +923,7 @@ void **Sys_ListFiles(   const char  *path,
 	void	*listedFiles[MAX_LISTED_FILES];
 	int		count = 0;
     char    *s;
+    size_t  len;
 
 	if( numFiles ) {
 		*numFiles = 0;
@@ -924,7 +931,7 @@ void **Sys_ListFiles(   const char  *path,
 
 	if( flags & FS_SEARCH_BYFILTER ) {
 		Sys_ListFilteredFiles( listedFiles, &count, path,
-            extension, flags, length, 0 );
+            extension, flags, baselen, 0 );
 	} else {
 		if( ( findHandle = opendir( path ) ) == NULL ) {
 			return NULL;
@@ -938,8 +945,11 @@ void **Sys_ListFiles(   const char  *path,
 				continue;
 			}
 
-			Q_concat( findPath, sizeof( findPath ),
+			len = Q_concat( findPath, sizeof( findPath ),
                 path, "/", findInfo->d_name, NULL );
+            if( len >= sizeof( findPath ) ) {
+                continue;
+            }
 
 			if( stat( findPath, &st ) == -1 ) {
 				continue;
@@ -959,7 +969,7 @@ void **Sys_ListFiles(   const char  *path,
 			}
             
 			if( flags & FS_SEARCH_SAVEPATH ) {
-				s = findPath + length;
+				s = findPath + baselen;
 			} else {
 				s = findInfo->d_name;
 			}
-- 
cgit v1.2.3