Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.c
index 7a5079ead40ee1d19a39da4b9bbd6c10135511f6..5d24b3db674e2089b8c73e5b57517d5a91e2f99b 100644 (file)
--- a/tools/quake3/common/scriplib.c
+++ b/tools/quake3/common/scriplib.c
@@ -227,7 +227,7 @@ qboolean GetToken( qboolean crossline ){
 // skip space
 //
 skipspace:
-       while ( *script->script_p <= 32 )
+       while ( script->script_p < script->end_p && *script->script_p <= 32 )
        {
                if ( script->script_p >= script->end_p ) {
                        return EndOfScript( crossline );
@@ -266,7 +266,7 @@ skipspace:
                        Error( "Line %i is incomplete\nFile location be: %s\n", scriptline, g_strLoadedFileLocation );
                }
                script->script_p += 2;
-               while ( script->script_p[0] != '*' && script->script_p[1] != '/' )
+               while ( script->script_p[0] != '*' || script->script_p[1] != '/' )
                {
                        if ( *script->script_p == '\n' ) {
                                script->line++;