From: Marcus Boerger <helly@php.net>
Date: Wed, 28 Jul 2004 22:55:26 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.0.1RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57ab773c70cd88955bc86b88ba1ff007335fd292;p=php

MFH
---

diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc
index af4b931ff4..7fecfa5758 100755
--- a/ext/spl/examples/autoload.inc
+++ b/ext/spl/examples/autoload.inc
@@ -33,7 +33,10 @@ function __load_class($classname, $dir)
  */
 function __autoload($classname) {
 	$classname = strtolower($classname);
-	foreach(split(':', ini_get('include_path')) as $dir)
+	$inc = split(':', ini_get('include_path'));
+	$inc[] = '.';
+	$inc[] = dirname($_SERVER['PATH_TRANSLATED']);
+	foreach($inc as $dir)
 	{
 		if (__load_class($classname, $dir))
 		{
@@ -41,10 +44,7 @@ function __autoload($classname) {
 			return;
 		}
 	}
-	if (!__load_class($classname, '.'))
-	if (!__load_class($classname, dirname($_SERVER['PATH_TRANSLATED'])))
 	fprintf(STDERR, 'Class not found ('.$classname.")\n");
-	return;
 }
 
 ?>
\ No newline at end of file
diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc
index 02b0840317..cd27ad7baa 100755
--- a/ext/spl/examples/dbareader.inc
+++ b/ext/spl/examples/dbareader.inc
@@ -28,32 +28,24 @@ class DbaReader implements Iterator
 	 * @param handler Handler to use for database access.
 	 */
 	function __construct($file, $handler) {
-		$this->db = dba_open($file, 'r', $handler);
+		if (!$this->db = dba_open($file, 'r', $handler)) {
+		    throw new exception('Could not open file ' . $file);
+		}
 	}
 	
 	/**
 	 * Close database.
 	 */
 	function __destruct() {
-		if ($this->db) {
-			dba_close($this->db);
-		}
+		dba_close($this->db);
 	}
 
 	/**
 	 * Rewind to first element.
 	 */
 	function rewind() {
-		if ($this->db) {
-			$this->key = dba_firstkey($this->db);
-		}
-	}
-
-	/**
-	 * @return Current data.
-	 */
-	function current() {
-		return $this->val;
+		$this->key = dba_firstkey($this->db);
+		fetch_data();
 	}
 
 	/**
@@ -62,14 +54,26 @@ class DbaReader implements Iterator
 	 * @return void
 	 */
 	function next() {
-		if ($this->db) {
-			$this->key = dba_nextkey($this->db);
-			if ($this->key !== false) {
-				$this->val = dba_fetch($this->key, $this->db);
-			}
+		$this->key = dba_nextkey($this->db);
+		fetch_data();
+	}
+
+    /**
+     * Fetches the current data if $key is valid
+     */	
+	private function fetch_data() {
+		if ($this->key !== false) {
+			$this->val = dba_fetch($this->key, $this->db);
 		}
 	}
 
+	/**
+	 * @return Current data.
+	 */
+	function current() {
+		return $this->val;
+	}
+
 	/**
 	 * @return Whether more elements are available.
 	 */
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index f0a768c2c0..3d09a7c463 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -634,8 +634,16 @@ SPL_METHOD(dual_it, getInnerIterator)
 	}
 } /* }}} */
 
+static INLINE void spl_dual_it_require(spl_dual_it_object *intern TSRMLS_DC)
+{
+	if (!intern->inner.iterator) {
+		php_error_docref(NULL TSRMLS_CC, E_ERROR, "The inner constructor wasn't initialized with an iterator instance");
+	}
+}
+
 static INLINE void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
 {
+	spl_dual_it_require(intern TSRMLS_CC);
 	if (intern->inner.iterator && intern->inner.iterator->funcs->invalidate_current) {
 		intern->inner.iterator->funcs->invalidate_current(intern->inner.iterator TSRMLS_CC);
 	}
@@ -698,6 +706,8 @@ static INLINE void spl_dual_it_next(spl_dual_it_object *intern, int do_free TSRM
 {
 	if (do_free) {
 		spl_dual_it_free(intern TSRMLS_CC);
+	} else {
+		spl_dual_it_require(intern TSRMLS_CC);
 	}
 	intern->inner.iterator->funcs->move_forward(intern->inner.iterator TSRMLS_CC);
 	intern->current.pos++;