stopped lisp symbols as values from being able to inject sql (SECURITY BUG)

[clsql.git] / sql / pool.lisp

diff --git a/sql/pool.lisp b/sql/pool.lisp
index 66cbaf76125d10b2a0ee600ae8044148635d3a44..820789f03eba1696f6c1d628fedd40c8e0ef348a 100644 (file)
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -33,7 +33,7 @@ that should, on avg keep the free connections about this size.")
         :initform (make-process-lock "Connection pool"))))
 
 
-(defun acquire-from-pool (connection-spec database-type &optional pool)
+(defun acquire-from-pool (connection-spec database-type &optional pool encoding)
   "Try to find a working database connection in the pool or create a new
 one if needed. This performs 1 query against the DB to ensure it's still
 valid. When possible (postgres, mssql) that query will be a reset
@@ -68,7 +68,8 @@ Disconnecting.~%"
    (let ((conn (connect (connection-spec pool)
                        :database-type (pool-database-type pool)
                        :if-exists :new
-                       :make-default nil)))
+                       :make-default nil
+                        :encoding encoding)))
      (with-process-lock ((conn-pool-lock pool) "new conection")
        (push conn (all-connections pool))
        (setf (conn-pool conn) pool))
@@ -121,6 +122,8 @@ chance to do cleanup."
         (database-execute-command "DISCARD ALL" database)))))
 
 (defun clear-conn-pool (pool)
+  "Be careful this function will disconnect connections without regard
+to whether another thread is actively using them."
   (with-process-lock ((conn-pool-lock pool) "Clear pool")
     (mapc #'%pool-force-disconnect (all-connections pool))
     (setf (all-connections pool) nil