admin/mongo-php-driver
1
0
Fork 0
mirror of https://github.com/macintoshplus/mongo-php-driver.git synced 2026-04-02 14:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use common return for zval_to_bson() bsonSerialize() error path

Browse Source 
This also initializes ht_data to NULL just to be safe.
This commit is contained in:
Jeremy Mikola
2015-05-04 14:40:46 -04:00
parent 0b987982fa
commit 7add8aec00
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bson.c
View File

@@ -767,7 +767,7 @@ void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char
PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
{
HashPosition pos;
HashTable *ht_data;
HashTable *ht_data = NULL;
zval *obj_data = NULL;
switch(Z_TYPE_P(data)) {
@@ -777,14 +777,13 @@ PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *
if (!obj_data) {
/* zend_call_method() failed */
return;
break;
}
if (Z_TYPE_P(obj_data) != IS_ARRAY) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Expected %s() to return an array, %s given", BSON_SERIALIZE_FUNC_NAME, zend_get_type_by_const(Z_TYPE_P(obj_data)));
zval_ptr_dtor(&obj_data);
return;
break;
}
ht_data = HASH_OF(obj_data);
@@ -807,7 +806,7 @@ PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *
return;
}
if (ht_data && ht_data->nApplyCount > 1) {
if (!ht_data || ht_data->nApplyCount > 1) {
if (obj_data) {
zval_ptr_dtor(&obj_data);
}