Add error messages back to Q_strncpyz/Q_strcat

Add Q_strnlen

Use hardened Q_atoi/Q_atof inspired by etlegacy&etjump since atoi/atof can crap out on invalid inputs

Simplify source code filenames to only show relative paths in warning/error messages.

Author: ensiform

code/api/et/q_shared.c

@@ -450,7 +450,7 @@ void Parse1DMatrix( const char **buf_p, int x, float *m ) {
 
 	for (i = 0 ; i < x; i++) {
 		token = COM_Parse( buf_p );
-		m[i] = atof( token );
+		m[i] = Q_atof( token );
 	}
 
 	COM_MatchToken( buf_p, ")" );

code/api/shared/q_string.c

@@ -43,6 +43,7 @@ If you have questions concerning this license or the applicable additional terms
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -207,19 +208,51 @@ qboolean Q_isintegral( float f )
 	return (qboolean)( (int)f == f );
 }
 
+#ifdef _WIN32
+#define QDECL __cdecl
+#define NORETURN __declspec(noreturn)
+#define FORMAT_PRINTF(x, y) /* nothing */
+#elif defined(__GNUC__) || defined(__clang__)
+#define QDECL
+#define NORETURN __attribute__((noreturn))
+#define FORMAT_PRINTF(x, y) __attribute__((format (printf, x, y)))
+#else
+#define QDECL
+#define NORETURN /* nothing */
+#endif
+
+void NORETURN trap_Error(const char *fmt);
+
+static void FORMAT_PRINTF(1,2) NORETURN QDECL Lib_Error( const char *error, ... ) {
+	va_list		argptr;
+	char		text[8192];
+
+	va_start (argptr, error);
+	Q_vsnprintf (text, sizeof(text), error, argptr);
+	va_end (argptr);
+
+	trap_Error( text );
+}
+
 /*
 =============
 Q_strncpyz
 
 Safe strncpy that ensures a trailing zero
 =============
 */
-void Q_strncpyz( char *dest, const char *src, int destsize ) {
-	assert(src);
-	assert(dest);
-	assert(destsize);
+void Q_strncpyz_fn( char *dest, const char *src, const int destsize, const char *func, const char *file, const int line ) {
+	if (!dest) {
+		Lib_Error("Q_strncpyz: NULL dest (%s, %s:%i)", func, file, line);
+	}
+	if (!src) {
+		Lib_Error("Q_strncpyz: NULL src (%s, %s:%i)", func, file, line);
+	}
+	if (destsize < 1) {
+		Lib_Error("Q_strncpyz: destsize < 1 (%s, %s:%i)", func, file, line);
+	}
 
-	strncpy( dest, src, destsize-1 );
+	strncpy( dest, src, (size_t)destsize-1 );
 	dest[destsize-1] = '\0';
 }
 
@@ -386,20 +419,30 @@ char *Q_strupr( char *s1 ) {
 }
 
 // never goes past bounds or leaves without a terminating 0
-void Q_strcat( char *dest, int size, const char *src ) {
-	int		l1;
+void Q_strcat_fn( char *dest, const int size, const char *src, const char *func, const char *file, const int line ) {
+	const int l1 = (int)strlen( dest );
 
-	l1 = strlen( dest );
 	if ( l1 >= size ) {
-		//Com_Error( ERR_FATAL, "Q_strcat: already overflowed" );
-		return;
+		Lib_Error( "Q_strcat: already overflowed" );
+		//return;
 	}
 	if ( strlen(src)+1 > (size_t)(size - l1))
 	{	//do the error here instead of in Q_strncpyz to get a meaningful msg
-		//Com_Error(ERR_FATAL,"Q_strcat: cannot append \"%s\" to \"%s\"", src, dest);
-		return;
+		Lib_Error("Q_strcat: cannot append \"%s\" to \"%s\"", src, dest);
+		//return;
+	}
+	Q_strncpyz_fn( dest + l1, src, size - l1, func, file, line );
+}
+
+size_t Q_strnlen_fn(const char *str, size_t strsz, const char *func, const char *file, const int line ) {
+	const char *p;
+	if (!str) {
+		Lib_Error("Q_strnlen: NULL str (%s, %s:%i)", func, file, line);
+		//return 0;
 	}
-	Q_strncpyz( dest + l1, src, size - l1 );
+
+	p = memchr(str, 0, strsz);
+	return p ? p - str : strsz;
 }
 
 char *Q_stradd( char *dst, const char *src )
@@ -687,3 +730,11 @@ int Q_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 }
 #endif
 
+float Q_atof(const char *str) {
+	const float f = strtof(str, NULL);
+	return (isfinite(f) ? f : 0);
+}
+
+int Q_atoi(const char *str) {
+	return (int)strtol(str, NULL, 10);
+}

code/api/shared/q_string.h

@@ -65,9 +65,16 @@ int	Q_stricmpn(const char *s1, const char *s2, int n);
 char *Q_strlwr( char *s1 );
 char *Q_strupr( char *s1 );
 
+// relative path to a source file (src/foo/bar.c)
+#define RELATIVE_FILENAME ((__FILE__) + (SOURCE_PATH_SIZE))
+
 // buffer size safe library replacements
-void Q_strncpyz( char *dest, const char *src, int destsize );
-void Q_strcat( char *dest, int size, const char *src );
+#define Q_strncpyz(dest, src, destsize) Q_strncpyz_fn(dest, src, destsize, __func__, RELATIVE_FILENAME, __LINE__)
+#define Q_strcat(dest, size, src) Q_strcat_fn(dest, size, src, __func__, RELATIVE_FILENAME, __LINE__)
+#define Q_strnlen(str, strsz ) Q_strnlen_fn(str, strsz, __func__, RELATIVE_FILENAME, __LINE__)
+void Q_strncpyz_fn( char *dest, const char *src, const int destsize, const char *func, const char *file, int line );
+void Q_strcat_fn( char *dest, const int size, const char *src, const char *func, const char *file, int line );
+size_t Q_strnlen_fn(const char *str, size_t strsz, const char *func, const char *file, int line );
 
 const char *Q_stristr( const char *s, const char *find);
 
@@ -95,6 +102,9 @@ char *Q_CleanDirName( char *dirname );
 	#define Q_vsnprintf vsnprintf
 #endif
 
+float Q_atof(const char *str);
+int Q_atoi(const char *str);
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif

code/cgame/cg_atmospheric.c

@@ -730,11 +730,11 @@ static void CG_EP_ParseFloats( const char *floatstr, float *f1, float *f2 )
 	if( *middleptr )
 	{
 		*middleptr++ = '\0';
-		*f1 = atof( floatstr );
-		*f2 = atof( middleptr );
+		*f1 = Q_atof( floatstr );
+		*f2 = Q_atof( middleptr );
 	}
 	else {
-		*f1 = *f2 = atof( floatstr );
+		*f1 = *f2 = Q_atof( floatstr );
 	}
 }
 
@@ -750,11 +750,11 @@ static void CG_EP_ParseInts( const char *intstr, int *i1, int *i2 )
 	if( *middleptr )
 	{
 		*middleptr++ = '\0';
-		*i1 = atof( intstr );
-		*i2 = atof( middleptr );
+		*i1 = Q_atof( intstr );
+		*i2 = Q_atof( middleptr );
 	}
 	else {
-		*i1 = *i2 = atof( intstr );
+		*i1 = *i2 = Q_atof( intstr );
 	}
 }
 

code/cgame/cg_consolecmds.c

@@ -466,9 +466,9 @@ static void CG_Q3F_DumpSpeaker( void )
 		Q_strncpyz( buff, buff, buffptr - buff + 1 );
 
 		if( !Q_stricmp( buff, "wait" ) )
-			wait = atoi( valueptr );
+			wait = Q_atoi( valueptr );
 		else if( !Q_stricmp( buff, "random" ) )
-			random = atoi( valueptr );
+			random = Q_atoi( valueptr );
 	}
 
 		// Open locations file
@@ -1291,27 +1291,27 @@ static void CG_Q3F_Discard_f( void ) {
 	}
 
 	trap_Cvar_VariableStringBuffer(va("discard_%s_cells", cls->commandstring), buffer, 256);
-	cells = atoi(buffer);
+	cells = Q_atoi(buffer);
 
 	trap_Cvar_VariableStringBuffer(va("discard_%s_shells", cls->commandstring), buffer, 256);
-	shells = atoi(buffer);
+	shells = Q_atoi(buffer);
 
 	trap_Cvar_VariableStringBuffer(va("discard_%s_rockets", cls->commandstring), buffer, 256);
-	rockets = atoi(buffer);
+	rockets = Q_atoi(buffer);
 
 	if(cells == -1) {
 		trap_Cvar_VariableStringBuffer("discard_cells", buffer, 256);
-		cells = atoi(buffer);
+		cells = Q_atoi(buffer);
 	}
 
 	if(shells == -1) {
 		trap_Cvar_VariableStringBuffer("discard_shells", buffer, 256);
-		shells = atoi(buffer);
+		shells = Q_atoi(buffer);
 	}
 
 	if(rockets == -1) {
 		trap_Cvar_VariableStringBuffer("discard_rockets", buffer, 256);
-		rockets = atoi(buffer);
+		rockets = Q_atoi(buffer);
 	}
 
 	trap_SendConsoleCommand(va("discard_etf %d %d %d\n", cells, shells, rockets));

code/cgame/cg_local.h

@@ -2185,7 +2185,7 @@ void		trap_R_ClearDecals( void );
 
 // normal sounds will have their volume dynamically changed as their entity
 // moves and the listener moves
-#define		trap_S_StartSound( origin, entityNum, entchannel, sfx ) trap_S_RealStartSound( origin, entityNum, entchannel, sfx, __FILE__, __LINE__ )
+#define		trap_S_StartSound( origin, entityNum, entchannel, sfx ) trap_S_RealStartSound( origin, entityNum, entchannel, sfx, RELATIVE_FILENAME, __LINE__ )
 void		trap_S_RealStartSound( const vec3_t origin, int entityNum, int entchannel, sfxHandle_t sfx, const char* file, int line );
 void		trap_S_StartSoundVControl( const vec3_t origin, int entityNum, int entchannel, sfxHandle_t sfx, int volume );
 void		trap_S_StartSoundEx( const vec3_t origin, int entityNum, int entchannel, sfxHandle_t sfx, int flags );
@@ -2195,7 +2195,7 @@ int			trap_S_GetSoundLength(sfxHandle_t sfx);
 int			trap_S_GetCurrentSoundTime( void );	// ydnar
 
 // a local sound is always played full volume
-#define		trap_S_StartLocalSound( sfx, channelNum ) trap_S_RealStartLocalSound( sfx, channelNum, __FILE__, __LINE__ )
+#define		trap_S_StartLocalSound( sfx, channelNum ) trap_S_RealStartLocalSound( sfx, channelNum, RELATIVE_FILENAME, __LINE__ )
 void		trap_S_RealStartLocalSound( sfxHandle_t sfx, int channelNum, const char* file, int line );
 //void		trap_S_ClearLoopingSounds( void );
 void		trap_S_ClearSounds( qboolean killmusic );

code/cgame/cg_main.c

@@ -218,7 +218,7 @@ static const int cvarLimitTableSize = (int)ARRAY_LEN( cvarLimitTable );
 CG_LimitCvars
 =================
 */
-void CG_LimitCvars( void ) {
+static void CG_LimitCvars( void ) {
 	int					i;
 	cvarLimitTable_t	*cvl;
 
@@ -272,23 +272,23 @@ void CG_LimitCvars( void ) {
 CG_Q3F_UpdateCvarLimits
 =================
 */
-void CG_Q3F_UpdateCvarLimit( const char *cvarname, int *min, int *max ) {
+static void CG_Q3F_UpdateCvarLimit( const char *cvarname, int *cvmin, int *cvmax ) {
 	int					i;
 	cvarLimitTable_t	*cvl;
 
 	for ( i = 0, cvl = cvarLimitTable; i < cvarLimitTableSize ; i++, cvl++ ) {
 		if( !Q_stricmp( cvarname, cvl->cvarName ) ) {
-			cvl->min = *min;
-			cvl->max = *max;
+			cvl->min = *cvmin;
+			cvl->max = *cvmax;
 			break;
 		}
 	}
 }
 
 void CG_Q3F_UpdateCvarLimits(void) {
 	const char *ptr;
-	char cvarname[64], buff[16];
-	int min, max;
+	char cvarname[64] = { 0 }, buff[16] = { 0 };
+	int cvmin, cvmax;
 	size_t len;
 
 	ptr = CG_ConfigString( CS_Q3F_CVARLIMITS );
@@ -299,25 +299,25 @@ void CG_Q3F_UpdateCvarLimits(void) {
 		}
 		while( *ptr && *ptr == ' ' )
 			ptr++;
-		cvarname[len] = 0;
+		cvarname[len] = '\0';
 
 		for( len = 0; *ptr && *ptr != ' ' && len < (sizeof(buff) - 1); len++ ) {
 			buff[len] = *ptr++;
 		}
 		while( *ptr && *ptr == ' ' )
 			ptr++;
-		buff[len] = 0;
-		min = atoi(buff);
+		buff[len] = '\0';
+		cvmin = Q_atoi(buff);
 
 		for( len = 0; *ptr && *ptr != ' ' && len < (sizeof(buff) - 1); len++ ) {
 			buff[len] = *ptr++;
 		}
 		while( *ptr && *ptr == ' ' )
 			ptr++;
-		buff[len] = 0;
-		max = atoi(buff);
+		buff[len] = '\0';
+		cvmax = Q_atoi(buff);
 
-		CG_Q3F_UpdateCvarLimit( cvarname, &min, &max );
+		CG_Q3F_UpdateCvarLimit( cvarname, &cvmin, &cvmax );
 	}
 }
 
@@ -418,7 +418,7 @@ void CG_RegisterCvars( void ) {
 
 	// see if we are also running the server on this machine
 	trap_Cvar_VariableStringBuffer( "sv_running", var, sizeof( var ) );
-	cgs.localServer = atoi( var );
+	cgs.localServer = Q_atoi( var );
 
 	cgs.grenadePrimeSoundModificationCount = cg_grenadePrimeSound.modificationCount;
 	cgs.drawSkyPortalModificationCount = cg_drawSkyPortal.modificationCount;
@@ -614,7 +614,7 @@ void CG_Q3F_PlayLocalSound( const char *sound )
 		soundid = -1;
 
 	if( soundid == -2 )
-		soundid = (sfxHandle_t)atoi( sound );
+		soundid = (sfxHandle_t)Q_atoi( sound );
 
 	if ( soundid >= 0 && soundid < MAX_SOUNDS )
 	{
@@ -1296,7 +1296,7 @@ void CG_LoadMenus(const char *menuFile, qboolean resetHud) {
 	}
 
 	trap_FS_Read( buf, len, f );
-	buf[len] = 0;
+	buf[len] = '\0';
 	trap_FS_FCloseFile( f );
 
 	COM_Compress(buf);
@@ -1372,8 +1372,8 @@ void CG_LoadMenus(const char *menuFile, qboolean resetHud) {
 					}
 				}
 
-				x = atof(_p);
-				y = atof(p2);
+				x = Q_atof(_p);
+				y = Q_atof(p2);
 
 				menu = Menus_FindByName( linebuff );
 
@@ -1978,7 +1978,7 @@ static float CG_Cvar_Get(const char *cvar) {
 	char buff[128];
 	memset(buff, 0, sizeof(buff));
 	trap_Cvar_VariableStringBuffer(cvar, buff, sizeof(buff));
-	return atof(buff);
+	return Q_atof(buff);
 }
 
 void CG_Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const char *text, int cursorPos, char cursor, int limit, int style, fontStruct_t *parentfont, int textalignment) {
@@ -2062,7 +2062,7 @@ static void CG_RunCinematicFrame(int handle) {
 }
 
 static void CG_S_StartLocalSound( sfxHandle_t sfx, int channelNum ) {
-	trap_S_RealStartLocalSound(sfx, channelNum, __FILE__, __LINE__ );
+	trap_S_RealStartLocalSound(sfx, channelNum, RELATIVE_FILENAME, __LINE__ );
 }
 
 qboolean CG_FileExists( const char *filename ) {