Skip to content

Commit 5657ec7

Browse files
committed
PHPC-110: Fix segfault on standalone nodes :)
1 parent 7bf0fb5 commit 5657ec7

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/MongoDB/Manager.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ static const char *phongo_cluster_state_tostring(mongoc_cluster_state_t state)
462462

463463
static void add_next_index_node(zval *array, mongoc_cluster_node_t *node)
464464
{
465+
zval *data = NULL;
465466
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
466467

467468
MAKE_STD_ZVAL(state.zchild);
468-
zval *data = NULL;
469469

470470
MAKE_STD_ZVAL(data);
471471
array_init(data);
@@ -502,7 +502,6 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
502502

503503
MAKE_STD_ZVAL(retval);
504504
array_init(retval);
505-
add_assoc_string_ex(retval, ZEND_STRS("foobar"), (char *)"some other cool stuff", 0);
506505

507506
add_assoc_long_ex(retval, ZEND_STRS("request_id"), intern->client->request_id);
508507
add_assoc_string_ex(retval, ZEND_STRS("uri"), (char *)mongoc_uri_get_string(intern->client->uri), 0);
@@ -551,7 +550,11 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
551550
}
552551
add_assoc_zval_ex(cluster, ZEND_STRS("peers"), peers);
553552
}
554-
add_assoc_string_ex(cluster, ZEND_STRS("replSet"), intern->client->cluster.replSet, 0);
553+
if (intern->client->cluster.replSet) {
554+
add_assoc_string_ex(cluster, ZEND_STRS("replSet"), intern->client->cluster.replSet, 0);
555+
} else {
556+
add_assoc_null_ex(cluster, ZEND_STRS("replSet"));
557+
}
555558

556559
add_assoc_zval_ex(retval, ZEND_STRS("cluster"), cluster);
557560
}

0 commit comments

Comments
 (0)