Changeset 58 for trunk/processor

Show
Ignore:
Timestamp:
06/03/2006 02:30:58 AM (3 years ago)
Author:
moo
Message:

refix as in the example from http://www.hardened-php.net/eaccelerator-0.9.3-hash-fix.patch

Location:
trunk/processor
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/processor/hashtable.m4

    r50 r58  
    7575 
    7676#if defined(HARDENING_PATCH_HASH_PROTECT) && HARDENING_PATCH_HASH_PROTECT 
    77         DISPATCH(unsigned int, canary) 
     77        IFASM(`dst->canary = zend_hash_canary; DONE(canary)', ` 
     78        dnl elseif 
     79            IFRESTORE(`dst->canary = zend_hash_canary; DONE(canary)', ` 
     80                dnl else 
     81                DISPATCH(unsigned int, canary) 
     82            ') 
     83        ') 
    7884#endif 
    7985        DISPATCH(uint, nTableSize) 

  • trunk/processor/head.m4

    r56 r58  
    1515#include "stack.h" 
    1616#include "xcache_globals.h" 
     17 
     18#if defined(HARDENING_PATCH_HASH_PROTECT) && HARDENING_PATCH_HASH_PROTECT 
     19extern unsigned int zend_hash_canary; 
     20#endif 
    1721 
    1822define(`SIZEOF_zend_uint', `sizeof(zend_uint)')