From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 23 Nov 2006 14:41:51 +0000 (+0000)
Subject: MFB: Fixed a possible crash
X-Git-Tag: RELEASE_1_0_0RC1~927
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d9c6b33d03efe455a95af883fdc3d0b0a6eab70;p=php

MFB: Fixed a possible crash
---

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 40413179f2..2133efb295 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sun Nov 12 12:56:00 2006 */
+/* Generated by re2c 0.10.6 on Thu Nov 23 09:42:00 2006 */
 #line 1 "ext/pdo/pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
@@ -412,11 +412,14 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
 							/* bork */
 							ret = -1;
 							strcpy(stmt->error_code, stmt->dbh->error_code);
-							efree(buf);
+							if (buf) {
+								efree(buf);
+							}
 							goto clean_up;
 						}
-						efree(buf);
-
+						if (buf) {
+							efree(buf);
+						}
 					} else {
 						pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource" TSRMLS_CC);
 						ret = -1;
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index 55a84b8fad..2ef69f6748 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -192,11 +192,14 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
 							/* bork */
 							ret = -1;
 							strcpy(stmt->error_code, stmt->dbh->error_code);
-							efree(buf);
+							if (buf) {
+								efree(buf);
+							}
 							goto clean_up;
 						}
-						efree(buf);
-
+						if (buf) {
+							efree(buf);
+						}
 					} else {
 						pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource" TSRMLS_CC);
 						ret = -1;