Merge pull request #179 from evolvedbinary/6.x.x/hotfix/sql-xml-memory-leak

[6.x.x] Fix a memory/resource leak in the sql:execute XPath functions

Author: adamretter

extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java

@@ -429,8 +429,9 @@ private ElementImpl resultAsElement(final boolean makeNodeFromColumnName, final
                                 //get the content
                                 if (rsmd.getColumnType(i + 1) == Types.SQLXML) {
                                     //parse sqlxml value
+                                    @Nullable SQLXML sqlXml = null;
                                     try {
-                                        final SQLXML sqlXml = rs.getSQLXML(i + 1);
+                                        sqlXml = rs.getSQLXML(i + 1);
 
                                         if (rs.wasNull()) {
                                             // Add a null indicator attribute if the value was SQL Null
@@ -456,7 +457,12 @@ private ElementImpl resultAsElement(final boolean makeNodeFromColumnName, final
                                         }
                                     } catch (final Exception e) {
                                         throw new XPathException(this, "Could not parse column of type SQLXML: " + e.getMessage(), e);
+                                    } finally {
+                                        if (sqlXml != null) {
+                                            sqlXml.free();
+                                        }
                                     }
+
                                 } else {
                                     //otherwise assume string value
                                     final String colValue = rs.getString(i + 1);