From: Marcus Boerger <helly@php.net>
Date: Mon, 31 Oct 2005 07:47:40 +0000 (+0000)
Subject: - Fix remaining memleaks
X-Git-Tag: RELEASE_1_0RC2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24a80c3ebf283cca9edece0f971469f3a9726803;p=php

- Fix remaining memleaks
# all tests pass for me now for the first time in:
# pgsql, mysql, sqlite, sqlite2
---

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index bf83c703ac..41ba56c33c 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1055,6 +1055,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
 					} else {
 						*return_value = *retval;
 						zval_copy_ctor(return_value);
+						INIT_PZVAL(return_value);
 						zval_ptr_dtor(&retval);
 					}
 				}
@@ -1401,7 +1402,9 @@ static PHP_METHOD(PDOStatement, fetchAll)
 		if (error != 2) {
 			RETURN_FALSE;
 		} else { /* on no results, return an empty array */
-			array_init(return_value);
+			if (Z_TYPE_P(return_value) != IS_ARRAY) {
+				array_init(return_value);
+			}
 			return;
 		}
 	}