cvs: php-src /ext/pgsql pgsql.c

helly Mon Apr 10 19:50:56 2006 UTC Modified files: /php-src/ext/pgsql pgsql.c Log: - Better order for SEGV prevention http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.349&r2=1.350&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.349 php-src/ext/pgsql/pgsql.c:1.350 --- php-src/ext/pgsql/pgsql.c:1.349 Mon Apr 10 19:48:27 2006 +++ php-src/ext/pgsql/pgsql.c Mon Apr 10 19:50:56 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.349 2006/04/10 19:48:27 helly Exp $ */ +/* $Id: pgsql.c,v 1.350 2006/04/10 19:50:56 helly Exp $ */ #include <stdlib.h> @@ -4586,7 +4586,7 @@ char *field = NULL; uint field_len = -1; ulong num_idx = -1; - zval *meta, **def, **type, **not_null, **has_default, **val, *new_val = NULL; + zval *meta, **def, **type, **not_null, **has_default, **val, *new_val; int new_len, key_type, err = 0, skip_field; assert(pg_link != NULL); @@ -4608,6 +4608,7 @@ zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&val, &pos) == SUCCESS; zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos)) { skip_field = 0; + new_val = NULL; if ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &field, &field_len, &num_idx, 0, &pos)) == HASH_KEY_NON_EXISTANT) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get array key type");