fixed a crash if decals are stuck to submodels when cl_entities expands

[xonotic/darkplaces.git] / pr_execprogram.h

diff --git a/pr_execprogram.h b/pr_execprogram.h
index 9cc8ed4c35ed6d34b3ec63a2f56715b437028276..5089e27577f3edf0de80852fb0f58db309171446 100644 (file)
--- a/pr_execprogram.h
+++ b/pr_execprogram.h
@@ -266,8 +266,10 @@
                                startprofile = profile;
                                pr_xstatement = st - pr_statements;
                                pr_argc = st->op - OP_CALL0;
-                               if (!OPA->function)
+                               if (!OPA->function )
                                        Host_Error("NULL function");
+                               else if (OPA->function > (unsigned) progs->numfunctions)
+                                       Host_Error("Bad function number");
 
                                newf = &pr_functions[OPA->function];
 
@@ -283,6 +285,8 @@
                                }
                                else
                                        st = pr_statements + PR_EnterFunction(newf);
+                               if (pr_trace != cachedpr_trace)
+                                       goto chooseexecprogram;
                                break;
 
                        case OP_DONE: