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 3506422ce965ac2b8bfa3c1c84adaacad59d715c..d912cd4ea9a2fda955445c458ba64296e8e2cf90 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3199,8 +3199,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 a7f8446ec3952956e0ced61d24faf636ba0a24cd..7099833899639f7aaabb5965be235397c1577ace 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -882,7 +882,7 @@ sub _bug_to_hash {
         $item{'blocks'} = \@blocks;
     }
     if (filter_wants $params, 'cc') {
-        my @cc = map { $self->type('email', $_) } @{ $bug->cc || [] };
+        my @cc = map { $self->type('email', $_) } @{ $bug->cc };
         $item{'cc'} = \@cc;
     }
     if (filter_wants $params, 'creator') {

diff --git a/enter_bug.cgi b/enter_bug.cgi
index a4dde21ba0449365790089dafa070c5730ee8a53..a609a2b9a5963b51c416fa0edbf19ce391d7b380 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');