Item13897: Fixed cloning of non-HASH blessed objects.

foswiki · Dec 16, 2016 · ed07442 · ed07442
1 parent eb65efc
commit ed07442
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/core/lib/Foswiki/Object.pm b/core/lib/Foswiki/Object.pm
@@ -22,7 +22,7 @@ features.
 require Carp;
 require Foswiki::Exception;
 use Try::Tiny;
-use Scalar::Util qw(blessed refaddr weaken isweak);
+use Scalar::Util qw(blessed refaddr reftype weaken isweak);
 
 use Foswiki::Class;
 
@@ -241,8 +241,24 @@ sub _cloneData {
                     # cloning as a hash and blessing the resulting hashref into
                     # $val's class.
                     # SMELL Pretty much unreliable for complex classes.
-                    $cloned =
-                      $this->_cloneData( {%$val}, "$attr.blessed($class)" );
+                    my $reftype = reftype($val);
+                    if ( $reftype eq 'HASH' ) {
+                        $cloned =
+                          $this->_cloneData( {%$val}, "$attr.blessed($class)" );
+                    }
+                    elsif ( $reftype eq 'ARRAY' ) {
+                        $cloned =
+                          $this->_cloneData( [@$val], "$attr.blessed($class)" );
+                    }
+                    elsif ( $reftype eq 'SCALAR' ) {
+                        $cloned =
+                          $this->_cloneData( \$$val, "$attr.blessed($class)" );
+                    }
+                    else {
+                        # Cannot clone unknown datatypes, just copy the original
+                        # ref.
+                        $cloned = $val;
+                    }
                     bless $cloned, ref($val)
                       if $cloned != $val;
                 }