From dcc66e8a32c150bc833db7f54093eb8eedece04b Mon Sep 17 00:00:00 2001
From: Brian Fraser <brian.fraser@percona.com>
Date: Wed, 12 Dec 2012 16:16:14 -0300
Subject: [PATCH] Fix for 1087319: Quoter::serialize_list() doesn't handle
 multiple NULL values

---
 lib/Quoter.pm  | 49 +++++++++++++++++++------------------------------
 t/lib/Quoter.t | 11 +++++++++--
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/lib/Quoter.pm b/lib/Quoter.pm
index ea05d00d..fb8169d3 100644
--- a/lib/Quoter.pm
+++ b/lib/Quoter.pm
@@ -161,16 +161,16 @@ sub serialize_list {
    # the same.  undef/NULL is a valid boundary value, however...
    return $args[0] if @args == 1 && !defined $args[0];
 
-   # ... if there's an undef/NULL value and more than one value,
-   # then we have no easy way to serialize the values into a list.
-   # We can't convert undef to "NULL" because "NULL" is a valid
-   # value itself, and we can't make it "" because a blank string
-   # is also a valid value.  In practice, a boundary value with
-   # two NULL values should be rare.
-   die "Cannot serialize multiple values with undef/NULL"
-      if grep { !defined $_ } @args;
-
-   return join ',', map { quotemeta } @args;
+   return join ',', map {
+         my $c = $_;
+         if ( defined($c) ) {
+            $c =~ s/([^A-Za-z0-9])/\\$1/g;
+            $c
+         }
+         else {
+            '\\N'
+         }
+      } @args;
 }
 
 sub deserialize_list {
@@ -193,29 +193,18 @@ sub deserialize_list {
    # the entire string represents the single element, so grab that.
    push @escaped_parts, pos($string) ? substr( $string, pos($string) ) : $string;
 
-   # Undo the quotemeta().
+   # Undo the escaping.
    my @unescaped_parts = map {
       my $part = $_;
-      # Here be weirdness. Unfortunately quotemeta() is broken, and exposes
-      # the internal representation of scalars. Namely, the latin-1 range,
-      # \128-\377 (\p{Latin1} in newer Perls) is all escaped in downgraded
-      # strings, but left alone in UTF-8 strings. Thus, this.
-
-      # TODO: quotemeta() might change in 5.16 to mean
-      # qr/(?=\p{ASCII})\W|\p{Pattern_Syntax}/
-      # And also fix this whole weird behavior under
-      # use feature 'unicode_strings' --  If/once that's
-      # implemented, this will have to change.
-      my $char_class = utf8::is_utf8($part)  # If it's a UTF-8 string,
-                     ? qr/(?=\p{ASCII})\W/   # We only care about non-word
-                                             # characters in the ASCII range
-                     : qr/(?=\p{ASCII})\W|[\x{80}-\x{FF}]/; # Otherwise,
-                                             # same as above, but also
-                                             # unescape the latin-1 range.
-      $part =~ s/\\($char_class)/$1/g;
-      $part;
+      if ($part eq '\\N') {
+         undef
+      }
+      else {
+         $part =~ s/\\([^A-Za-z0-9])/$1/g;
+         $part;
+      }
    } @escaped_parts;
-
+   
    return @unescaped_parts;
 }
 
diff --git a/t/lib/Quoter.t b/t/lib/Quoter.t
index 3224f7cb..feda1ba1 100644
--- a/t/lib/Quoter.t
+++ b/t/lib/Quoter.t
@@ -150,6 +150,12 @@ is(
    "Deserialize undef string",
 );
 
+is(
+   $q->serialize_list(undef, undef),
+   '\\N,\\N',
+   "Serialize two undefs",
+);
+
 my @serialize_tests = (
    [ 'a', 'b', ],
    [ 'a,', 'b', ],
@@ -169,6 +175,8 @@ my @serialize_tests = (
    [ '', '', '', ],
    [ '' ],
    [ undef ],
+   [ undef, undef, '', undef ],
+   [ '\\N', '\\\\N', undef ],
 );
 
 use DSNParser;
@@ -200,13 +208,12 @@ SKIP: {
       # Bit of a hack, but we want to test both of Perl's internal encodings
       # for correctness.
       local $dbh->{'mysql_enable_utf8'} = 1 if utf8::is_utf8($ser);
-
       $sth->execute($test_index, $ser);
       $selsth->execute($test_index);
 
       my $flat_string =  "["
 	                  . join( "][",
-					           map { defined($_) ? $_ : '' } @{$serialize_tests[$test_index]}
+					           map { defined($_) ? $_ : '<undef>' } @{$serialize_tests[$test_index]}
 							)
 					  . "]";
       $flat_string =~ s/\n/\\n/g;