← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/php5/gutsy-security

« back to all changes in this revision

Viewing changes to Zend/zend_execute_API.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-06-11 20:32:54 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070611203254-b4k8nggrm5vxul1j
Tags: 5.2.3-1ubuntu1
* Merge from debian unstable, remaining changes:
 - debian/changelog: Add some missing CVEs.
 - debian/control: DebianMaintainerField
 - debian/control, debian/rules: Disable a few build dependencies and
   accompanying binary packages which we do not want to support in main:
   + firebird2-dev/php5-interbase (we have a separate php-interbase source)
   + libc-client-dev/php5-imap (we have a separate php-imap source)
   + libmcrypt-dev/php5-mcrypt (separate php-mcrypt source)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Zend/zend_execute_API.c
17
17
   +----------------------------------------------------------------------+
18
18
*/
19
19
 
20
 
/* $Id: zend_execute_API.c,v 1.331.2.20.2.19 2007/04/27 08:12:24 tony2001 Exp $ */
 
20
/* $Id: zend_execute_API.c,v 1.331.2.20.2.21 2007/05/21 07:12:41 tony2001 Exp $ */
21
21
 
22
22
#include <stdio.h>
23
23
#include <signal.h>
675
675
                }
676
676
 
677
677
                if (fci->object_pp) {
 
678
                        if (Z_TYPE_PP(fci->object_pp) == IS_OBJECT
 
679
                                && (!EG(objects_store).object_buckets || !EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(fci->object_pp)].valid)) {
 
680
                                return FAILURE;
 
681
                        }
678
682
                        /* TBI!! new object handlers */
679
683
                        if (Z_TYPE_PP(fci->object_pp) == IS_OBJECT) {
680
684
                                if (!IS_ZEND_STD_OBJECT(**fci->object_pp)) {
839
843
                calling_scope = fci_cache->calling_scope;
840
844
                fci->object_pp = fci_cache->object_pp;
841
845
                EX(object) = fci->object_pp ? *fci->object_pp : NULL;
 
846
                if (fci->object_pp && *fci->object_pp && Z_TYPE_PP(fci->object_pp) == IS_OBJECT
 
847
                        && (!EG(objects_store).object_buckets || !EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(fci->object_pp)].valid)) {
 
848
                        return FAILURE;
 
849
                }
842
850
        }
843
851
 
844
852
        if (EX(function_state).function->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) {