[prev in list] [next in list] [prev in thread] [next in thread]
List: pecl-cvs
Subject: [PECL-CVS] cvs: pecl /runkit runkit_sandbox.c runkit_sandbox_parent.c
From: "Sara Golemon" <pollita () php ! net>
Date: 2005-10-28 16:25:02
Message-ID: cvspollita1130516702 () cvsserver
[Download RAW message or body]
pollita Fri Oct 28 12:25:02 2005 EDT
Modified files:
/pecl/runkit runkit_sandbox.c runkit_sandbox_parent.c
Log:
Trailing ; at end of BEGIN() macros was confusing C++ compilers
Most notably MSVC++
Strip them all off for a nice uniform look.
["pollita-20051028122502.txt" (text/plain)]
http://cvs.php.net/diff.php/pecl/runkit/runkit_sandbox.c?r1=1.22&r2=1.23&ty=u
Index: pecl/runkit/runkit_sandbox.c
diff -u pecl/runkit/runkit_sandbox.c:1.22 pecl/runkit/runkit_sandbox.c:1.23
--- pecl/runkit/runkit_sandbox.c:1.22 Thu Sep 29 20:37:10 2005
+++ pecl/runkit/runkit_sandbox.c Fri Oct 28 12:25:00 2005
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: runkit_sandbox.c,v 1.22 2005/09/30 00:37:10 pollita Exp $ */
+/* $Id: runkit_sandbox.c,v 1.23 2005/10/28 16:25:00 pollita Exp $ */
#include "php_runkit.h"
@@ -36,7 +36,7 @@
}
#define PHP_RUNKIT_SANDBOX_END(objval) \
- PHP_RUNKIT_SANDBOX_ABORT(objval); \
+ PHP_RUNKIT_SANDBOX_ABORT(objval) \
if (objval->bailed_out_in_eval) { \
/* We're actually in bailout mode, but the child's bailout address had to resolve \
first */ \ zend_bailout(); \
@@ -294,7 +294,7 @@
objval->disable_classes = NULL;
objval->output_handler = NULL;
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
objval->parent_context = prior_context;
zend_alter_ini_entry("implicit_flush", sizeof("implicit_flush") , "1", 1, \
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); @@ -311,7 +311,7 @@
php_request_startup(TSRMLS_C);
RUNKIT_G(current_sandbox) = objval;
PG(during_request_startup) = 0;
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
/* Prime the sandbox to be played in */
objval->active = 1;
@@ -340,7 +340,7 @@
argc = zend_hash_num_elements(Z_ARRVAL_P(args));
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
{
zval ***sandbox_args;
char *name = NULL;
@@ -355,7 +355,7 @@
if (name) {
efree(name);
}
- PHP_RUNKIT_SANDBOX_ABORT(objval);
+ PHP_RUNKIT_SANDBOX_ABORT(objval)
RETURN_FALSE;
}
@@ -399,7 +399,7 @@
objval->active = 0;
} zend_end_try();
}
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (bailed_out) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed calling sandbox function");
@@ -409,9 +409,9 @@
PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(return_value);
if (retval) {
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zval_ptr_dtor(&retval);
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
}
}
/* }}} */
@@ -439,7 +439,7 @@
RETVAL_NULL();
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_first_try {
zend_op_array *op_array = NULL;
int already_included = 0;
@@ -498,7 +498,7 @@
objval->active = 0;
bailed_out = 1;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (bailed_out) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error executing sandbox code");
@@ -509,9 +509,9 @@
/* Don't confuse the memory manager */
if (retval) {
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zval_ptr_dtor(&retval);
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
}
}
/* }}} */
@@ -582,7 +582,7 @@
RETURN_NULL();
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_try {
for(i = 0; i < argc; i++) {
PHPWRITE(Z_STRVAL_P(argv[i]),Z_STRLEN_P(argv[i]));
@@ -590,7 +590,7 @@
} zend_catch {
objval->active = 0;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
RETURN_NULL();
}
@@ -616,13 +616,13 @@
RETURN_NULL();
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_try {
PHPWRITE(str,len);
} zend_catch {
objval->active = 0;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
RETURN_BOOL(len > 1 || (len == 1 && str[0] != '0'));
}
@@ -652,7 +652,7 @@
return;
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_try {
if (message) {
if (Z_TYPE_P(message) == IS_LONG) {
@@ -666,7 +666,7 @@
/* goes without saying doesn't it? */
objval->active = 0;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
}
/* }}} */
@@ -697,7 +697,7 @@
member = tmp_member;
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_try {
zval **value;
@@ -709,7 +709,7 @@
/* Almost certainly impossible... */
objval->active = 0;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (tmp_member) {
zval_ptr_dtor(&tmp_member);
@@ -754,7 +754,7 @@
member = tmp_member;
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_try {
zval *copyval;
@@ -766,7 +766,7 @@
/* An emalloc() could bailout */
objval->active = 0;
} zend_end_try();
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (tmp_member) {
zval_ptr_dtor(&tmp_member);
@@ -801,7 +801,7 @@
convert_to_string(member);
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
{
zval **tmpzval;
@@ -841,7 +841,7 @@
result = 0;
}
}
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (member == &member_copy) {
zval_dtor(member);
@@ -875,9 +875,9 @@
convert_to_string(member);
}
- PHP_RUNKIT_SANDBOX_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_BEGIN(objval)
zend_hash_del(&EG(symbol_table), Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
- PHP_RUNKIT_SANDBOX_END(objval);
+ PHP_RUNKIT_SANDBOX_END(objval)
if (member == &member_copy) {
zval_dtor(member);
http://cvs.php.net/diff.php/pecl/runkit/runkit_sandbox_parent.c?r1=1.3&r2=1.4&ty=u
Index: pecl/runkit/runkit_sandbox_parent.c
diff -u pecl/runkit/runkit_sandbox_parent.c:1.3 \
pecl/runkit/runkit_sandbox_parent.c:1.4
--- pecl/runkit/runkit_sandbox_parent.c:1.3 Thu Sep 29 20:37:10 2005
+++ pecl/runkit/runkit_sandbox_parent.c Fri Oct 28 12:25:00 2005
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: runkit_sandbox_parent.c,v 1.3 2005/09/30 00:37:10 pollita Exp $ */
+/* $Id: runkit_sandbox_parent.c,v 1.4 2005/10/28 16:25:00 pollita Exp $ */
#include "php_runkit.h"
@@ -46,7 +46,7 @@
} zend_catch { \
objval->self->bailed_out_in_eval = 1; \
} zend_end_try(); \
- PHP_RUNKIT_SANDBOX_PARENT_ABORT(objval); \
+ PHP_RUNKIT_SANDBOX_PARENT_ABORT(objval) \
if (objval->self->bailed_out_in_eval) { \
/* If the parent is dying, so are we */ \
zend_bailout(); \
@@ -113,7 +113,7 @@
argc = zend_hash_num_elements(Z_ARRVAL_P(args));
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
{
HashPosition pos;
zval **tmpzval, ***sandbox_args;
@@ -126,7 +126,7 @@
if (name) {
efree(name);
}
- PHP_RUNKIT_SANDBOX_PARENT_ABORT(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_ABORT(objval)
RETURN_FALSE;
}
@@ -166,14 +166,14 @@
}
efree(sandbox_args);
}
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(return_value);
if (retval) {
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zval_ptr_dtor(&retval);
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
}
}
/* }}} */
@@ -206,7 +206,7 @@
RETVAL_NULL();
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zend_op_array *op_array = NULL;
int already_included = 0;
@@ -267,24 +267,24 @@
*/
bailed_out = 1;
}
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
if (bailed_out) {
CG(unclean_shutdown) = 1;
CG(in_compilation) = EG(in_execution) = 0;
EG(current_execute_data) = NULL;
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zend_bailout();
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
}
PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(return_value);
/* Don't confuse the memory manager */
if (retval) {
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zval_ptr_dtor(&retval);
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
}
}
/* }}} */
@@ -354,11 +354,11 @@
RETURN_FALSE;
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
for(i = 0; i < argc; i++) {
PHPWRITE(Z_STRVAL_P(argv[i]),Z_STRLEN_P(argv[i]));
}
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
RETURN_NULL();
}
@@ -383,9 +383,9 @@
RETURN_FALSE;
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
PHPWRITE(str,len);
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
RETURN_BOOL(len > 1 || (len == 1 && str[0] != '0'));
}
@@ -421,7 +421,7 @@
CG(in_compilation) = EG(in_execution) = 0;
EG(current_execute_data) = NULL;
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
if (message) {
if (Z_TYPE_P(message) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(message);
@@ -431,7 +431,7 @@
}
zend_bailout();
/* More of a murder-suicide really... */
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
}
/* }}} */
@@ -465,14 +465,14 @@
member = tmp_member;
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zval **value;
if (zend_hash_find(php_runkit_sandbox_parent_resolve_symbol_table(objval \
TSRMLS_CC), Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void**)&value) == SUCCESS) { \
retval = **value; prop_found = 1;
}
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
if (tmp_member) {
zval_ptr_dtor(&tmp_member);
@@ -520,14 +520,14 @@
member = tmp_member;
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
zval *copyval;
MAKE_STD_ZVAL(copyval);
*copyval = *value;
PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(copyval);
ZEND_SET_SYMBOL(&EG(symbol_table), Z_STRVAL_P(member), copyval);
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
if (tmp_member) {
zval_ptr_dtor(&tmp_member);
@@ -553,7 +553,7 @@
}
if (!objval->self->parent_access || !objval->self->parent_read) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Access to read parent's symbol table \
is disallowed");
- return EG(uninitialized_zval_ptr);
+ return 0;
}
if (Z_TYPE_P(member) != IS_STRING) {
@@ -564,7 +564,7 @@
convert_to_string(member);
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
{
zval **tmpzval;
@@ -604,7 +604,7 @@
result = 0;
}
}
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
if (member == &member_copy) {
zval_dtor(member);
@@ -637,12 +637,12 @@
convert_to_string(member);
}
- PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_BEGIN(objval)
if (zend_hash_exists(&EG(symbol_table), Z_STRVAL_P(member), Z_STRLEN_P(member) + \
1)) { /* Simply removing the zval* causes weirdness with CVs */
zend_hash_update(&EG(symbol_table), Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, \
(void*)&EG(uninitialized_zval_ptr), sizeof(zval*), NULL); }
- PHP_RUNKIT_SANDBOX_PARENT_END(objval);
+ PHP_RUNKIT_SANDBOX_PARENT_END(objval)
if (member == &member_copy) {
zval_dtor(member);
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic