From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 19 Oct 2002 04:46:19 +0000 (+0000)
Subject: Skip field when there is obvious error.
X-Git-Tag: php-4.3.0pre2~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29a53a47f6fa8cee9809cc3d766bb81373093a80;p=php

Skip field when there is obvious error.
Fixed freeing of wrong zval.
---

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index cde7b2ba95..48bcc26291 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3356,6 +3356,8 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval
 		 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;
+		MAKE_STD_ZVAL(new_val);
+		
 		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");
 			err = 1;
@@ -3391,10 +3393,10 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval
 			err = 1;
 		}
 		if (err) {
+			skip_field = 1; /* prevent adding invalid feild */
 			break;
 		}
 		
-		MAKE_STD_ZVAL(new_val);
 		switch(php_pgsql_get_data_type(Z_STRVAL_PP(type), Z_STRLEN_PP(type)))
 		{
 			case PG_BOOL: