PHPC-1748 Fix wrong return value of Cursor::key when iterator is not valid

Author: alcaeus

src/MongoDB/Cursor.c

@@ -64,6 +64,11 @@ static int php_phongo_cursor_valid(php_phongo_cursor_t* cursor) /* {{{ */
 
 static void php_phongo_cursor_get_current_key(php_phongo_cursor_t* cursor, zval* key) /* {{{ */
 {
+	if (Z_ISUNDEF(cursor->visitor_data.zchild)) {
+		ZVAL_NULL(key);
+		return;
+	}
+
 	ZVAL_LONG(key, cursor->current);
 } /* }}} */
 

tests/cursor/cursor-iterator-003.phpt

@@ -0,0 +1,43 @@
+--TEST--
+MongoDB\Driver\Cursor handles invalid positions gracefully
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_not_clean(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+$bulkWrite = new MongoDB\Driver\BulkWrite;
+$bulkWrite->insert(array('_id' => 0));
+
+$writeResult = $manager->executeBulkWrite(NS, $bulkWrite);
+
+$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()));
+
+$cursor->rewind();
+var_dump($cursor->valid());
+var_dump($cursor->key());
+var_dump($cursor->current());
+
+$cursor->next();
+var_dump($cursor->valid());
+var_dump($cursor->key());
+var_dump($cursor->current());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+int(0)
+object(stdClass)#%d (1) {
+  ["_id"]=>
+  int(0)
+}
+bool(false)
+NULL
+NULL
+===DONE===