Merge pull request #84 from datastax/112

112 - Fix: Freeing a null future as result of a failure in DefaultSession::…

Author: mpenick

ext/src/Cassandra/DefaultSession.c

@@ -664,8 +664,7 @@ PHP_METHOD(DefaultSession, executeAsync)
   CassStatement *single = NULL;
   CassBatch *batch  = NULL;
 
-  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|z", &statement,
-                           cassandra_statement_ce, &options) == FAILURE) {
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|z", &statement, &options) == FAILURE) {
     return;
   }
 

ext/src/Cassandra/FutureRows.c

@@ -132,7 +132,9 @@ php_cassandra_future_rows_free(php5to7_zend_object_free *object TSRMLS_DC)
   php_cassandra_del_ref(&self->statement);
   php_cassandra_del_ref(&self->result);
 
-  cass_future_free(self->future);
+  if (self->future) {
+    cass_future_free(self->future);
+  }
 
   zend_object_std_dtor(&self->zval TSRMLS_CC);
   PHP5TO7_MAYBE_EFREE(self);