Merge pull request #68

Author: jmikola

.travis.scripts/compile.sh

@@ -30,7 +30,7 @@ wget -O run-tests.php https://raw.githubusercontent.com/php/php-src/master/run-t
 
 rm -rf tmp-lcov tmp # coveralls may pick it up and lie about our coverage
 
-echo "extension=phongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
 
 MONGO=`which mongo`
 mongod --version

src/bson.c

@@ -893,6 +893,9 @@ int bson_to_zval(const unsigned char *data, int data_len, php_phongo_bson_state
 	      bool           eof = false;
 		  TSRMLS_FETCH();
 
+	/* Ensure that state->zchild has a type, since the calling code may want to
+	 * zval_ptr_dtor() it if we throw an exception. */
+	ZVAL_NULL(state->zchild);
 
 	reader = bson_reader_new_from_data(data, data_len);