Changeset 1275 in svn for trunk


Ignore:
Timestamp:
2013-06-25T05:01:31Z (2 years ago)
Author:
Xuefer
Message:

disassembler: fixes crash with nested sandbox (since 3.0)

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r1265 r1275  
    22ChangeLog
    33========
     4 * disassembler: fixes crash with nested sandbox
    45 * adds support for PHP_5_5
    56 * compatible with fcntl fork
  • trunk/NEWS

    r1265 r1275  
    113.1.0 2013-??-??
    22========
     3 * disassembler now working again (fail since 3.0)
    34 * adds support for PHP_5_5
    45 * compatible with fcntl fork
  • trunk/xcache/xc_sandbox.c

    r1178 r1275  
    4545#endif
    4646
    47 typedef struct { /* sandbox {{{ */
     47typedef struct _xc_sandbox_t { /* sandbox {{{ */
    4848    ZEND_24(NOTHING, const) char *filename;
    4949
     
    7777    zend_uint orig_compiler_options;
    7878#endif
     79    struct _xc_sandbox_t *parent;
    7980} xc_sandbox_t;
    8081
     
    229230#endif
    230231
     232    sandbox->parent = XG(sandbox);
    231233    XG(sandbox) = (void *) sandbox;
    232234    XG(initial_compile_file_called) = 0;
     
    320322static void xc_sandbox_free(xc_sandbox_t *sandbox, zend_op_array *op_array TSRMLS_DC) /* {{{ */
    321323{
    322     XG(sandbox) = NULL;
     324    XG(sandbox) = sandbox->parent;
    323325#ifdef XCACHE_ERROR_CACHING
    324326    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
Note: See TracChangeset for help on using the changeset viewer.