summaryrefslogtreecommitdiff
path: root/execute.c
diff options
context:
space:
mode:
Diffstat (limited to 'execute.c')
-rw-r--r--execute.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/execute.c b/execute.c
index 82a4866..560d8f5 100644
--- a/execute.c
+++ b/execute.c
@@ -150,7 +150,7 @@ static int suhosin_check_filename(char *s, int len TSRMLS_DC)
150 return SUHOSIN_CODE_TYPE_MANYDOTS; 150 return SUHOSIN_CODE_TYPE_MANYDOTS;
151 } 151 }
152 152
153SDEBUG("xxx %08x %08x",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist)); 153SDEBUG("xxx %p %p",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist));
154 /* no black or whitelist then disallow all */ 154 /* no black or whitelist then disallow all */
155 if (SUHOSIN_G(include_whitelist)==NULL && SUHOSIN_G(include_blacklist)==NULL) { 155 if (SUHOSIN_G(include_whitelist)==NULL && SUHOSIN_G(include_blacklist)==NULL) {
156 /* disallow all URLs */ 156 /* disallow all URLs */
@@ -519,7 +519,7 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML
519 } else { 519 } else {
520 if (suhosin_zend_extension_entry.resource_number != -1) { 520 if (suhosin_zend_extension_entry.resource_number != -1) {
521 suhosin_flags = (unsigned long *) &op_array->reserved[suhosin_zend_extension_entry.resource_number]; 521 suhosin_flags = (unsigned long *) &op_array->reserved[suhosin_zend_extension_entry.resource_number];
522 SDEBUG("suhosin flags: %08x", *suhosin_flags); 522 SDEBUG("suhosin flags: %08lx", *suhosin_flags);
523 523
524 if (*suhosin_flags & SUHOSIN_FLAG_CREATED_BY_EVAL) { 524 if (*suhosin_flags & SUHOSIN_FLAG_CREATED_BY_EVAL) {
525 SUHOSIN_G(in_code_type) = SUHOSIN_EVAL; 525 SUHOSIN_G(in_code_type) = SUHOSIN_EVAL;
@@ -632,7 +632,6 @@ not_evaled_code:
632 case SUHOSIN_CODE_TYPE_UNKNOWN: 632 case SUHOSIN_CODE_TYPE_UNKNOWN:
633 case SUHOSIN_CODE_TYPE_GOODFILE: 633 case SUHOSIN_CODE_TYPE_GOODFILE:
634 goto continue_execution; 634 goto continue_execution;
635 break;
636 } 635 }
637 636
638continue_execution: 637continue_execution:
@@ -1060,9 +1059,8 @@ int ih_fixusername(IH_HANDLER_PARAMS)
1060 if (!SUHOSIN_G(simulation)) { 1059 if (!SUHOSIN_G(simulation)) {
1061 RETVAL_FALSE; 1060 RETVAL_FALSE;
1062 return (1); 1061 return (1);
1063 } else {
1064 break;
1065 } 1062 }
1063 break;
1066 } 1064 }
1067 cp++; 1065 cp++;
1068 } 1066 }