Merged pull request #847

Author: derickr

collection.c

@@ -2088,6 +2088,7 @@ void mongo_collection_list_indexes_command(zval *this_ptr, zval *return_value TS
 			if (Z_TYPE_P(code) == IS_LONG && Z_LVAL_P(code) == PHP_MONGO_COLLECTION_DOES_NOT_EXIST) {
 				zend_clear_exception(TSRMLS_C);
 				zval_ptr_dtor(&retval);
+				MAKE_STD_ZVAL(retval);
 				array_init(retval);
 			}
 		}

tests/standalone/bug01435.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test for PHP-1435: MongoCollection::getIndexInfo on non-existing collection segfaults
+--SKIPIF--
+<?php require_once "tests/utils/standalone.inc" ?>
+--FILE--
+<?php
+require_once "tests/utils/server.inc";
+
+$host = MongoShellServer::getStandaloneInfo();
+$m = new MongoClient($host);
+$c = $m->selectCollection('doesnotexist', 'doesnotexist');
+$i = $c->getIndexInfo();
+$m->close();
+var_dump($i);
+?>
+==DONE==
+--EXPECTF--
+array(0) {
+}
+==DONE==