From 7c2ede6f6e5a86608cc562299bc7efdff38dad9c Mon Sep 17 00:00:00 2001
From: "ccooper%deadsquid.com"
 <ccooper%deadsquid.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 9 Nov 2007 16:35:45 +0000
Subject: [PATCH] b=403185 - don't croak on malformed utf-8, just log it so we
 can fix it

git-svn-id: svn://10.0.0.236/trunk@239064 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/litmus/Litmus/DBI.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mozilla/webtools/litmus/Litmus/DBI.pm b/mozilla/webtools/litmus/Litmus/DBI.pm
index 1e128146936..dc55745c8a5 100755
--- a/mozilla/webtools/litmus/Litmus/DBI.pm
+++ b/mozilla/webtools/litmus/Litmus/DBI.pm
@@ -226,6 +226,13 @@ sub AUTOLOAD {
     return $self->$col(@args);
 }
 
+sub _log {
+    my ($self, $message, %info) = @_;
+    binmode(STDERR,':utf8');
+    print STDERR "$message";
+    return;
+}
+
 # DBI error handler for SQL errors:        
 sub _croak {
 	my ($self, $message, %info) = @_;
@@ -315,7 +322,7 @@ sub utf8_columns {
           # the process. Turn the bit off again.
           Encode::_utf8_off($self->{$_});
           # ..and die
-          $self->_croak("Invalid UTF8 from database in column '$_'");
+          $self->_log("Invalid UTF8 from database in column '$_': " . $self->{$_});
         }
       }
     }