From 15563f8d91c1f0e76e36eb59eec3a39b6793abb5 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@php.net>
Date: Fri, 17 Jun 2005 16:32:43 +0000
Subject: [PATCH] fix for bug #33263 (mysqli_real_escape doesn't work in
 __construct)

---
 ext/mysqli/mysqli_api.c        | 10 ++++++++--
 ext/mysqli/tests/bug33263.phpt | 31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 ext/mysqli/tests/bug33263.phpt

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 2fc40bb6df3..f41d858eb2e 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1030,7 +1030,13 @@ PHP_FUNCTION(mysqli_init)
 
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
 	mysqli_resource->ptr = (void *)mysql;
-	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);	
+
+	if (!getThis()) {
+		MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);	
+	} else {
+		((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource;
+		((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->valid = 1;
+	}
 }
 /* }}} */
 
@@ -1743,7 +1749,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
 	ulong	attr;
 	int		rc;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olb", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode) == FAILURE) {
 		return;
 	}
 	MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt"); 
diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt
new file mode 100644
index 00000000000..44f9167c95d
--- /dev/null
+++ b/ext/mysqli/tests/bug33263.phpt
@@ -0,0 +1,31 @@
+--TEST--
+bug #33263 (mysqli_real_connect in __construct) 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+	include "connect.inc";
+
+	class test extends mysqli
+	{
+		public function __construct($host, $user, $passwd, $db) {
+			parent::init();
+			parent::real_connect($host, $user, $passwd, $db);
+		}
+	}
+
+	$mysql = new test($host, $user, $passwd, "test");
+
+	$stmt = $mysql->prepare("SELECT DATABASE()");
+	$stmt->execute();
+	$stmt->bind_result($db);
+	$stmt->fetch();
+	$stmt->close();
+
+	var_dump($db);
+
+	$mysql->close();	
+?>
+--EXPECT--
+string(4) "test"