cvs: php-src(PHP_5_2) /ext/standard var_unserializer.re

jani Mon Aug 6 18:23:16 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard var_unserializer.re Log: - fix ws http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.5&r2=1.52.2.2.2.6&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.5 php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6 --- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.5 Mon Aug 6 16:45:23 2007 +++ php-src/ext/standard/var_unserializer.re Mon Aug 6 18:23:16 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.52.2.2.2.5 2007/08/06 16:45:23 iliaa Exp $ */ +/* $Id: var_unserializer.re,v 1.52.2.2.2.6 2007/08/06 18:23:16 jani Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -144,7 +144,7 @@ char *str = safe_emalloc(*len, 1, 1); unsigned char *end = *(unsigned char **)p+maxlen; - if(end < *p) { + if (end < *p) { efree(str); return NULL; } @@ -304,7 +304,7 @@ zval_dtor(key); FREE_ZVAL(key); - if (elements && *(*p-1) != ';' && *(*p-1) != '}') { + if (elements && *(*p-1) != ';' && *(*p-1) != '}') { (*p)--; return 0; } @@ -315,7 +315,7 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER) { - if (*((*p)++) == '}') + if (*((*p)++) == '}') return 1; #if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE @@ -328,7 +328,7 @@ { long datalen; - if(ce->unserialize == NULL) { + if (ce->unserialize == NULL) { zend_error(E_WARNING, "Class %s has no unserializer", ce->name); return 0; } @@ -337,12 +337,12 @@ (*p) += 2; - if(datalen < 0 || (*p) + datalen >= max) { + if (datalen < 0 || (*p) + datalen >= max) { zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); return 0; } - if(ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) { + if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) { return 0; } @@ -373,7 +373,7 @@ } if (Z_OBJCE_PP(rval) != PHP_IC_ENTRY && - zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup"))) { + zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup"))) { INIT_PZVAL(&fname); ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0); call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC); @@ -592,7 +592,7 @@ zval **args[1]; zval *arg_func_name; - if(*start == 'C') { + if (*start == 'C') { custom_object = 1; } @@ -674,7 +674,7 @@ *p = YYCURSOR; - if(custom_object) { + if (custom_object) { efree(class_name); return object_custom(UNSERIALIZE_PASSTHRU, ce); }