Merge pull request #40 from flightaware/BCK-5740

Update Pgtcl to use Tcl Utf conversion routines to ensure all SQL passed into Postgres is legal.
flightaware · Apr 2, 2021 · 01d751e · 01d751e
2 parents 6e84e47 + 94bc3d5
commit 01d751e
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 99 deletions.
diff --git a/configure.in b/configure.in
@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([pgtcl], [2.7.5])
+AC_INIT([pgtcl], [2.7.6])
 
 #-----
 # Version with patch stripped

diff --git a/generic/pgtcl.c b/generic/pgtcl.c
@@ -160,7 +160,7 @@ Pgtcl_Init(Tcl_Interp *interp)
                     * No really good way to do error handling here, since we
                     * don't know how we were loaded
                     */
-                    return FALSE;
+                    return TCL_ERROR;
             }
 
     #endif
@@ -181,8 +181,10 @@ Pgtcl_Init(Tcl_Interp *interp)
 	if (tclversion >= 8.1)
 		Tcl_PutEnv("PGCLIENTENCODING=UNICODE");
 
-	/* register all pgtcl commands */
+	if(pgtclInitEncoding(interp) != TCL_OK)
+		return TCL_ERROR;
 
+	/* register all pgtcl commands */
 
 	for (cmdPtr = commands; cmdPtr->name != NULL; cmdPtr++) {
 		Tcl_CreateObjCommand(interp, cmdPtr->name,