Backpatch dbmirror fix for escape handling.

bmomjian · bmomjian · commit a7aa0b818970 · 2006-07-06T01:57:25.000Z
> Upstream confirmed my reply in the last mail in [1]: the complete > escaping logic in DBMirror.pl is seriously screwew. > > [1] http://archives.postgresql.org/pgsql-bugs/2006-06/msg00065.php I finally found some time to debug this, and I think I found a better patch than the one you proposed. Mine is still hackish and is still a workaround around a proper quoting solution, but at least it repairs the parsing without introducing the \' quoting again. I consider this a band-aid patch to fix the recent security update. PostgreSQL gurus, would you consider applying this until a better solution is found for DBMirror.pl? Olivier, can you please confirm that the patch works for you, too? Backpatched to 8.0.X. Martin Pitt
diff --git a/contrib/dbmirror/DBMirror.pl b/contrib/dbmirror/DBMirror.pl
@@ -33,7 +33,7 @@
 # 
 #
 ##############################################################################
-# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.11 2006/05/19 02:38:47 momjian Exp $ 
+# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.12 2006/07/06 01:57:25 momjian Exp $ 
 #
 ##############################################################################
 
@@ -907,7 +907,7 @@ ($$)
 	$matchString = $1;
 	$value .= substr $matchString,0,length($matchString)-1;
 
-	if($matchString =~ m/(\'$)/s) {
+	if($matchString =~ m/(\'$)/s and (substr $dataField,length($matchString),1) ne "'") {
 	  # $1 runs to the end of the field value.
 	    $dataField = substr $dataField,length($matchString)+1;
 	    last;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#`
`34`	`34`	`#`
`35`	`35`	`##############################################################################`
`36`		`-# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.11 2006/05/19 02:38:47 momjian Exp $`
	`36`	`+# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.12 2006/07/06 01:57:25 momjian Exp $`
`37`	`37`	`#`
`38`	`38`	`##############################################################################`
`39`	`39`
`@@ -907,7 +907,7 @@ ($$)`
`907`	`907`	`$matchString = $1;`
`908`	`908`	`$value .= substr $matchString,0,length($matchString)-1;`
`909`	`909`
`910`		`- if($matchString =~ m/(\'$)/s) {`
	`910`	`+ if($matchString =~ m/(\'$)/s and (substr $dataField,length($matchString),1) ne "'") {`
`911`	`911`	`# $1 runs to the end of the field value.`
`912`	`912`	`$dataField = substr $dataField,length($matchString)+1;`
`913`	`913`	`last;`