com php-src: IS_OBJECT and IS_RESOURCE is obviously exclusive: ext/standard/type.c

From: Date: Thu, 26 Jun 2014 10:29:25 +0000
Subject: com php-src: IS_OBJECT and IS_RESOURCE is obviously exclusive: ext/standard/type.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79082@lists.php.net to get a copy of this message
Commit: 46f4e9b56e39c1b178ab84e4449eaf851116a6ec Author: Xinchen Hui <laruence@php.net> Thu, 26 Jun 2014 18:29:25 +0800 Parents: f75c04ac8da837da1a264eb0edbe383ae71ae199 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46f4e9b56e39c1b178ab84e4449eaf851116a6ec Log: IS_OBJECT and IS_RESOURCE is obviously exclusive Changed paths: M ext/standard/type.c Diff: diff --git a/ext/standard/type.c b/ext/standard/type.c index a42dd0b..72f1660 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -218,16 +218,16 @@ static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type) if (Z_TYPE_P(arg) == type) { if (type == IS_OBJECT) { zend_class_entry *ce; - if(Z_OBJ_HT_P(arg)->get_class_entry == NULL) { - /* if there's no get_class_entry it's not a PHP object, so it can't be INCOMPLETE_CLASS */ + if (Z_OBJ_HT_P(arg)->get_class_entry == NULL) { + /* if there's no get_class_entry it's not a PHP object, so it can't be INCOMPLETE_CLASS */ RETURN_TRUE; } ce = Z_OBJCE_P(arg); - if (!strcmp(ce->name->val, INCOMPLETE_CLASS)) { + if (ce->name->len == sizeof(INCOMPLETE_CLASS) - 1 + && !strncmp(ce->name->val, INCOMPLETE_CLASS, ce->name->len)) { RETURN_FALSE; } - } - if (type == IS_RESOURCE) { + } else if (type == IS_RESOURCE) { const char *type_name = zend_rsrc_list_get_rsrc_type(Z_RES_P(arg) TSRMLS_CC); if (!type_name) { RETURN_FALSE;

« previous php.cvs (#79082) next »