secured exec context for mdl's cfgs (and pre package auto-downloader work ?)

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6631 e016b1c5-ed68-44aa-a2f7-31cac88cffde

config/scontext.cfg

@@ -5,16 +5,19 @@
 context_core   = 0 // hardcoded scripts
 context_cfg    = 1 // known scripts
 context_prompt = 2 // command prompt
-context_mapcfg = 3 // map configs, we don't trust them
+context_mdlcfg = 4 // mdl configs, same
 
 // set allowed commands for the map config context
 mapcfgidents = [ loadnotexture loadsky mapmodelreset mapmodel texturereset texture fog fogcolour mapsoundreset mapsound watercolour shadowyaw ]
+mdlcfgidents = [ md2anim md2emit md2tag md3anim md3emit md3link md3load md3skin mdlalphatest mdlcachelimit mdlcullface mdlscale mdlshadowdist mdltrans mdltranslucent mdlvertexlight]
 loop i (listlen $mapcfgidents) [ scriptcontext $context_mapcfg (at $mapcfgidents $i) ]
+loop i (listlen $mdlcfgidents) [ scriptcontext $context_mdlcfg (at $mdlcfgidents $i) ]
 
 // isolate the map config context
 // this disables access from this context to identifiers located in other contexts
 // also it removes all aliases created in this context once the running context changes
 isolatecontext $context_mapcfg
+isolatecontext $context_mdlcfg
 
 // secure this configuration for the rest of the game
 sealcontexts

source/src/command.h

@@ -87,7 +87,7 @@ enum    // function signatures for script functions, see command.cpp
     ARG_VARI
 };
 
-enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_NUM }; // script execution context
+enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_MDLCFG, IEXC_NUM }; // script execution context
 
 // nasty macros for registering script functions, abuses globals to avoid excessive infrastructure
 #define COMMANDN(name, fun, nargs) static bool __dummy_##fun = addcommand(#name, (void (*)())fun, nargs)

source/src/rendermodel.cpp

@@ -116,6 +116,7 @@ model *loadmodel(const char *name, int i)
     if(mm) m = *mm;
     else
     {
+        pushscontext(IEXC_MDLCFG);
         m = new md2(name);
         loadingmodel = m;
         if(!m->load())
@@ -127,9 +128,10 @@ model *loadmodel(const char *name, int i)
             {
                 delete m;
                 loadingmodel = NULL;
-                return NULL;
             }
         }
+        popscontext();
+        if(!loadingmodel) return NULL;
         loadingmodel = NULL;
         mdllookup.access(m->name(), m);
     }