Correctly re-setting the buffered statement setting for MySQL in case…

… of an exception closes #10135
cakephp · Jan 31, 2017 · da419ca · da419ca
1 parent b2b7f76
commit da419ca
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Database/Statement/MysqlStatement.php b/src/Database/Statement/MysqlStatement.php
@@ -32,9 +32,14 @@ class MysqlStatement extends PDOStatement
      */
     public function execute($params = null)
     {
-        $this->_driver->connection()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, $this->_bufferResults);
-        $result = $this->_statement->execute($params);
-        $this->_driver->connection()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+        $connection = $this->_driver->connection();
+
+        try {
+            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, $this->_bufferResults);
+            $result = $this->_statement->execute($params);
+        } finally {
+            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+        }
 
         return $result;
     }