--- embedaddon/php/ext/spl/spl_dllist.c 2012/05/29 12:34:42 1.1.1.2 +++ embedaddon/php/ext/spl/spl_dllist.c 2013/10/14 08:02:32 1.1.1.4 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_dllist.c,v 1.1.1.2 2012/05/29 12:34:42 misho Exp $ */ +/* $Id: spl_dllist.c,v 1.1.1.4 2013/10/14 08:02:32 misho Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -368,7 +368,7 @@ zend_object_iterator *spl_dllist_get_iterator(zend_cla static zend_object_value spl_dllist_object_new_ex(zend_class_entry *class_type, spl_dllist_object **obj, zval *orig, int clone_orig TSRMLS_DC) /* {{{ */ { - zend_object_value retval; + zend_object_value retval = {0}; spl_dllist_object *intern; zend_class_entry *parent = class_type; int inherited = 0; @@ -880,7 +880,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset) } intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC); - index = (int)spl_offset_convert_to_long(zindex TSRMLS_CC); + index = spl_offset_convert_to_long(zindex TSRMLS_CC); llist = intern->llist; if (index < 0 || index >= intern->llist->count) {