Bug 819330: Bugzilla crashes when cloning a bug if the CC list is empty

r=dkl a=LpSolit

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 6e37b19f1c9430618df447d07cf17e53679353bb..229a24003fbce20d92eb800142b0ccf9c2979954 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3187,8 +3187,6 @@ sub cc {
         ORDER BY profiles.login_name},
       undef, $self->bug_id);
 
-    $self->{'cc'} = undef if !scalar(@{$self->{'cc'}});
-
     return $self->{'cc'};
 }
 

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index f4181c336dbe2accc187a25b5d119c423fa15dd0..71b2e52cd4194f5b328669aa516e0804113fcc10 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -877,7 +877,7 @@ sub _bug_to_hash {
         $item{'blocks'} = \@blocks;
     }
     if (filter_wants $params, 'cc') {
-        my @cc = map { $self->type('string', $_) } @{ $bug->cc || [] };
+        my @cc = map { $self->type('string', $_) } @{ $bug->cc };
         $item{'cc'} = \@cc;
     }
     if (filter_wants $params, 'creator') {

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 7a8cebf43c5c94f3ce76427f13aabf7711bc9b2c..1f80501d588f5b5827b2f9508a9339925267dd30 100755 (executable)
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -208,7 +208,7 @@ if ($cloned_bug_id) {
     $vars->{'deadline'}       = $cloned_bug->deadline;
     $vars->{'estimated_time'} = $cloned_bug->estimated_time;
 
-    if (defined $cloned_bug->cc) {
+    if (scalar @{$cloned_bug->cc}) {
         $vars->{'cc'}         = join (", ", @{$cloned_bug->cc});
     } else {
         $vars->{'cc'}         = formvalue('cc');