Merge remote-tracking branch 'github/master'

[xonotic/netradiant.git] / tools / quake3 / common / cmdlib.c

diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c
index 5164001c04fae612b26de2758328c07e01fbfb03..41fd1ca140c7b15389c706e447d76e200379b14c 100644 (file)
--- a/tools/quake3/common/cmdlib.c
+++ b/tools/quake3/common/cmdlib.c
@@ -244,7 +244,10 @@ char *ExpandArg( const char *path ){
 
 char *ExpandPath( const char *path ){
        static char full[1024];
 
 char *ExpandPath( const char *path ){
        static char full[1024];

-       if ( !*qdir || path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
+       if ( !qdir ) {
+               Error( "ExpandPath called without qdir set" );
+       }
+       if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {

                strcpy( full, path );
                return full;
        }
                strcpy( full, path );
                return full;
        }


@@ -254,7 +257,7 @@ char *ExpandPath( const char *path ){
 
 char *ExpandGamePath( const char *path ){
        static char full[1024];
 
 char *ExpandGamePath( const char *path ){
        static char full[1024];

-       if ( !*gamedir ) {
+       if ( !gamedir[0] ) {

                Error( "ExpandGamePath called without gamedir set" );
        }
        if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
                Error( "ExpandGamePath called without gamedir set" );
        }
        if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {