diff options
| author | Dylan Hardison <dylan@mozilla.com> | 2016-07-04 23:36:58 +0200 |
|---|---|---|
| committer | Dylan Hardison <dylan@mozilla.com> | 2016-07-04 23:36:58 +0200 |
| commit | 9a15297a823443b19661211293bb79e7f42a44e3 (patch) | |
| tree | 6201a329e16964b86f74a8c152e3b63d66c7339f /Bugzilla | |
| parent | 3bf65ba172080fbed1e7d4e285075fa67de73fed (diff) | |
| download | bugzilla-9a15297a823443b19661211293bb79e7f42a44e3.tar.gz bugzilla-9a15297a823443b19661211293bb79e7f42a44e3.tar.xz | |
Bug 1282606 - Fix TrackingFlags memory leak
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Attachment.pm | 7 | ||||
| -rw-r--r-- | Bugzilla/Bug.pm | 14 | ||||
| -rw-r--r-- | Bugzilla/Comment.pm | 7 |
3 files changed, 24 insertions, 4 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index 0cdec6bf0..3b4953f64 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -62,6 +62,7 @@ use Bugzilla::Hook; use File::Copy; use List::Util qw(max); +use Scalar::Util qw(weaken); use Storable qw(dclone); use base qw(Bugzilla::Object); @@ -157,8 +158,12 @@ the bug object to which the attachment is attached =cut sub bug { + my ($self) = @_; require Bugzilla::Bug; - return $_[0]->{bug} //= Bugzilla::Bug->new({ id => $_[0]->bug_id, cache => 1 }); + return $self->{bug} if defined $self->{bug}; + my $bug = $self->{bug} = Bugzilla::Bug->new({ id => $_[0]->bug_id, cache => 1 }); + weaken($self->{bug}); + return $bug; } =over diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 09696f97b..327fb866c 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -66,6 +66,8 @@ use base qw(Bugzilla::Object Exporter); editable_bug_fields ); +my %CLEANUP; + ##################################################################### # Constants ##################################################################### @@ -367,6 +369,9 @@ sub new { return $error_self; } + $CLEANUP{$self->id} = $self; + weaken($CLEANUP{$self->id}); + return $self; } @@ -381,6 +386,15 @@ sub object_cache_key { return $key . ',' . Bugzilla->user->id; } +sub CLEANUP { + foreach my $bug (values %CLEANUP) { + next unless $bug; + delete $bug->{depends_on_obj}; + delete $bug->{blocks_obj}; + } + %CLEANUP = (); +} + sub check { my $class = shift; my ($param, $field) = @_; diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm index 69e973c7f..ff718c9e1 100644 --- a/Bugzilla/Comment.pm +++ b/Bugzilla/Comment.pm @@ -34,7 +34,7 @@ use Bugzilla::User; use Bugzilla::Util; use List::Util qw(first); -use Scalar::Util qw(blessed); +use Scalar::Util qw(blessed weaken); ############################### #### Initialization #### @@ -241,8 +241,9 @@ sub collapsed_reason { sub bug { my $self = shift; require Bugzilla::Bug; - $self->{bug} ||= new Bugzilla::Bug($self->bug_id); - return $self->{bug}; + my $bug = $self->{bug} ||= new Bugzilla::Bug($self->bug_id); + weaken($self->{bug}); + return $bug; } sub is_about_attachment { |