PHP mysqlnd svn commit: r575 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-06-28 17:15:43 +0200 (Thu, 28 Jun 2007)
New Revision: 575

Modified:
   trunk/mysqlnd/mysqlnd.c
Log:
Fix leak and memory problems.


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2007-06-28 14:55:54 UTC (rev 574)
+++ trunk/mysqlnd/mysqlnd.c	2007-06-28 15:15:43 UTC (rev 575)
@@ -687,14 +687,16 @@
 		if (wild) {
 			show_query_len = spprintf(&show_query, 0, query, wild);
 		} else {
-			show_query_len = spprintf(&show_query, 0, query);	
+			show_query_len = strlen(show_query = (char *)query);	
 		}	
 	}
 
 	if (PASS == conn->m->query(conn, show_query, show_query_len TSRMLS_CC)) {
+		result = conn->m->store_result(conn TSRMLS_CC);
+	}
+	if (show_query != query) {
 		efree(show_query);
-		result = conn->m->store_result(conn TSRMLS_CC);
-	} 
+	}
 	return result;
 }
 /* }}} */