cl_deathfade: new effect which makes the screen fade to dark red when you die......

[xonotic/darkplaces.git] / prvm_execprogram.h

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 41f722f061ac0c5b39c62fa4e99a826d4058130c..52da1343afc1f36a3a446c4824da653aef4b9c7f 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -3,7 +3,7 @@
 
                while (1)
                {
-                       st++; // TODO bounds check
+                       st++;
 
 #if PRVMTRACE
                        PRVM_PrintStatement(st);
@@ -40,6 +40,8 @@
                                OPC->vector[0] = OPA->_float * OPB->vector[0];
                                OPC->vector[1] = OPA->_float * OPB->vector[1];
                                OPC->vector[2] = OPA->_float * OPB->vector[2];
+                               break;
+                       case OP_MUL_VF:
                                OPC->vector[0] = OPB->_float * OPA->vector[0];
                                OPC->vector[1] = OPB->_float * OPA->vector[1];
                                OPC->vector[2] = OPB->_float * OPA->vector[2];
@@ -80,13 +82,13 @@
                                OPC->_float = OPA->_float < OPB->_float;
                                break;
                        case OP_AND:
-                               OPC->_float = OPA->_float && OPB->_float;
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float
                                break;
                        case OP_OR:
-                               OPC->_float = OPA->_float || OPB->_float;
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float
                                break;
                        case OP_NOT_F:
-                               OPC->_float = !OPA->_float;
+                               OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
                                break;
                        case OP_NOT_V:
                                OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
@@ -180,6 +182,13 @@
 
                        case OP_ADDRESS:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -205,6 +214,13 @@
                        case OP_LOAD_S:
                        case OP_LOAD_FNC:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -213,12 +229,19 @@
                                        goto cleanup;
                                }
 #endif
-                               ed = PRVM_PROG_TO_EDICT(OPA->edict); // TODO bounds check entity number
+                               ed = PRVM_PROG_TO_EDICT(OPA->edict);
                                OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int;
                                break;
 
                        case OP_LOAD_V:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -227,7 +250,7 @@
                                        goto cleanup;
                                }
 #endif
-                               ed = PRVM_PROG_TO_EDICT(OPA->edict); // TODO bounds check entity number
+                               ed = PRVM_PROG_TO_EDICT(OPA->edict);
                                OPC->ivector[0] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[0];
                                OPC->ivector[1] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[1];
                                OPC->ivector[2] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[2];
@@ -236,14 +259,15 @@
                //==================
 
                        case OP_IFNOT:
-                               if (!OPA->_float)
-                               // TODO add an "int-ifnot"
+                               if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                               // TODO add an "int-if", and change this one to OPA->_float
                                // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
                                // and entity, string, field values can never have that value
                                {
                                        prog->xfunction->profile += (st - startst);
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
+                                       // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                        if (++jumpcount == 10000000)
                                        {
@@ -256,14 +280,15 @@
                                break;
 
                        case OP_IF:
-                               if (OPA->_float)
-                               // TODO add an "int-if"
+                               if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                               // TODO add an "int-if", and change this one, as well as the FLOAT_IS_TRUE_FOR_INT usages, to OPA->_float
                                // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
                                // and entity, string, field values can never have that value
                                {
                                        prog->xfunction->profile += (st - startst);
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
+                                       // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                        if (++jumpcount == 10000000)
                                        {
@@ -279,6 +304,7 @@
                                prog->xfunction->profile += (st - startst);
                                st += st->a - 1;        // offset the s++
                                startst = st;
+                               // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                if (++jumpcount == 10000000)
                                {
@@ -304,7 +330,18 @@
                                prog->argc = st->op - OP_CALL0;
                                if (!OPA->function)
                                        PRVM_ERROR("NULL function in %s", PRVM_NAME);
-                               newf = &prog->functions[OPA->function]; // TODO bounds check function
+
+#if PRVMBOUNDSCHECK
+                               if(!OPA->function || OPA->function >= (unsigned int)prog->progs->numfunctions)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements; // we better stay on the previously executed statement
+                                       PRVM_ERROR("%s CALL outside the program", PRVM_NAME);
+                                       goto cleanup;
+                               }
+#endif
+
+                               newf = &prog->functions[OPA->function];
                                newf->callcount++;
 
                                if (newf->first_statement < 0)
@@ -523,7 +560,7 @@
                                break;
                        case OP_LOAD_I:
 #if PRBOUNDSCHECK
-                               if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
                                {
                                        prog->xfunction->profile += (st - startst);
                                        prog->xstatement = st - prog->statements;