com php-src: Make sure return value is initialised in case transaction startup fails: ext/mysqlnd/mysqlnd.c

From: Date: Wed, 03 Jul 2013 15:08:14 +0000
Subject: com php-src: Make sure return value is initialised in case transaction startup fails: ext/mysqlnd/mysqlnd.c
Groups: php.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
Commit:    5bc7e597d990eb3c38d07c0189d27c246c7b4ae5
Author:    Johannes Schlüter <[email protected]>         Wed, 3 Jul 2013 17:08:14 +0200
Parents:   0265c2d961aa99e00361d6ab0f845dc1e8782558
Branches:  PHP-5.4 PHP-5.5 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=5bc7e597d990eb3c38d07c0189d27c246c7b4ae5

Log:
Make sure return value is initialised in case transaction startup fails

Changed paths:
  M  ext/mysqlnd/mysqlnd.c


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index d70582b..8ed810d 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1061,7 +1061,7 @@ static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query,
unsigned int query_len TSRMLS_DC)
 {
 	size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query);
-	enum_func_status ret;
+	enum_func_status ret = FAIL;
 	DBG_ENTER("mysqlnd_conn_data::send_query");
 	DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query);
 
@@ -1468,7 +1468,7 @@ static ulong
 MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn, char * newstr,
const char * escapestr, size_t escapestr_len TSRMLS_DC)
 {
 	size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, escape_string);
-	ulong ret;
+	ulong ret = FAIL;
 	DBG_ENTER("mysqlnd_conn_data::escape_string");
 	DBG_INF_FMT("conn=%llu", conn->thread_id);

Thread (1 message)

  • Johannes Schlüter
« previous php.cvs (#72578) next »