From: Michael Wallner <mike@php.net>
Date: Thu, 11 Sep 2014 14:41:18 +0000 (+0200)
Subject: fix possible invalid free and a leak
X-Git-Tag: v0.5.0~34
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a04c77181328660f1ca748cb82a20abe43cebb65;p=m6w6%2Fext-pq

fix possible invalid free and a leak
---

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index cb2d72f..5d5da7a 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -1713,12 +1713,11 @@ static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_h
 	HashTable *converters = va_arg(argv, HashTable *);
 
 	tmp = *zoid;
+	Z_ADDREF_P(tmp);
 	convert_to_long_ex(&tmp);
 	Z_ADDREF_PP(zcnv);
 	zend_hash_index_update(converters, Z_LVAL_P(tmp), zcnv, sizeof(zval *), NULL);
-	if (tmp != *zoid) {
-		zval_ptr_dtor(&tmp);
-	}
+	zval_ptr_dtor(&tmp);
 
 	return ZEND_HASH_APPLY_KEEP;
 }
@@ -1745,11 +1744,10 @@ static PHP_METHOD(pqconn, setConverter) {
 
 			zend_call_method_with_0_params(&zcnv, NULL, NULL, "converttypes", &zoids);
 			tmp = zoids;
-			convert_to_array_ex(&zoids);
-			zend_hash_apply_with_arguments(Z_ARRVAL_P(zoids) TSRMLS_CC, apply_set_converter, 2, &zcnv, &obj->intern->converters);
-			if (tmp != zoids) {
-				zval_ptr_dtor(&tmp);
-			}
+			Z_ADDREF_P(tmp);
+			convert_to_array_ex(&tmp);
+			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 2, &zcnv, &obj->intern->converters);
+			zval_ptr_dtor(&tmp);
 			zval_ptr_dtor(&zoids);
 		}
 	}
diff --git a/src/php_pqtypes.c b/src/php_pqtypes.c
index e0dadde..e5733da 100644
--- a/src/php_pqtypes.c
+++ b/src/php_pqtypes.c
@@ -136,6 +136,7 @@ static int php_pqtypes_object_has_dimension(zval *object, zval *member, int chec
 					return Z_TYPE_PP(data) != IS_NULL;
 				}
 				efree(key_str);
+				key_str = NULL;
 			} else {
 				if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) &data)) {
 					return Z_TYPE_PP(data) != IS_NULL;
@@ -172,9 +173,10 @@ static zval *php_pqtypes_object_read_dimension(zval *object, zval *member, int t
 				return *data;
 			}
 		}
-		if (key_str) {
-			efree(key_str);
-		}
+	}
+
+	if (key_str) {
+		efree(key_str);
 	}
 
 	return NULL;