Merged pull request #843

Author: derickr

cursor.c

@@ -708,6 +708,10 @@ PHP_METHOD(MongoCursor, explain)
 	zval_ptr_dtor(&yes);
 	php_mongocursor_next(cursor, return_value TSRMLS_CC);
 
+	if (php_mongo_handle_error(cursor TSRMLS_CC)) {
+		return;
+	}
+
 	/* reset cursor to original state */
 	cursor->limit = temp_limit;
 	zend_hash_del(HASH_P(cursor->query), "$explain", strlen("$explain") + 1);

tests/generic/bug01425.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Test for PHP-1425: explain() does not raise appropriate exception for $err conditions
+--SKIPIF--
+<?php require_once "tests/utils/standalone.inc"; ?>
+--FILE--
+<?php
+require_once "tests/utils/server.inc";
+
+$host = MongoShellServer::getStandaloneInfo();
+$m = new MongoClient($host);
+
+$m->admin->command( array( 'setParameter' => 1, 'notablescan' => 1 ) );
+
+$c = $m->selectCollection(dbname(), collname(__FILE__));
+
+$c->drop();
+$c->insert( array( 'foo' => 'bar' ) );
+try
+{
+    $c->find( array( 'foo' => 'bar' ) )->explain();
+    echo "FAILED: MongoCursorException should have been thrown\n";
+}
+catch ( MongoCursorException $e )
+{
+    // Error message and code vary between server versions, so don't assert their values
+    echo "MongoCursorException was thrown\n";
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once "tests/utils/server.inc";
+
+$host = MongoShellServer::getStandaloneInfo();
+$m = new MongoClient($host);
+$m->admin->command(array('setParameter' => 1, 'notablescan' => 0));
+
+?>
+--EXPECTF--
+MongoCursorException was thrown
+===DONE===