[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#690281: file-mmagic 1.27-2 for testing



Thank you guys for your comments.

The following is debdiff:

diff -u file-mmagic-1.27/debian/changelog file-mmagic-1.27/debian/changelog
--- file-mmagic-1.27/debian/changelog
+++ file-mmagic-1.27/debian/changelog
@@ -1,8 +1,17 @@
+file-mmagic (1.27-1+deb7u1) testing-proposed-updates; urgency=low
+
+  * Fix deprecated array existing check.
+     http://cvs.namazu.org/Subversion/MMagic/trunk/MMagic.pm?r1=279&r2=281
+  * Fix memory leak.
+     http://cvs.namazu.org/Subversion/MMagic/trunk/MMagic.pm?r1=278&r2=279
+
+ -- NOKUBI Takatsugu <knok@daionet.gr.jp>  Wed, 28 Nov 2012 14:37:05 +0900
+
 file-mmagic (1.27-1) unstable; urgency=low
 
   * New upstream release
 
- -- NOKUBI Takatsugu <knok@daionet.gr.jp>  Wed,  1 Nov 2006 15:28:57 +0900
+ -- NOKUBI Takatsugu <knok@daionet.gr.jp>  Mon, 26 Nov 2012 16:58:33 +0900
 
 file-mmagic (1.26-1) unstable; urgency=low
 
only in patch2:
unchanged:
--- file-mmagic-1.27.orig/MMagic.pm
+++ file-mmagic-1.27/MMagic.pm
@@ -302,6 +302,7 @@
 
 use FileHandle;
 use strict;
+use Scalar::Util;
 
 use vars qw(
 %TEMPLATES %ESC $VERSION
@@ -715,6 +716,7 @@
 
     $fname =~ s/^.*\///;
     for my $regex (keys %{$self->{FILEEXTS}}) {
+	Scalar::Util::weaken($self->{FILEEXTS});
 	if ($fname =~ /$regex/i) {
 	    if ((defined $type && $type !~ /;/) || (! defined $type)) {
 		$type = $self->{FILEEXTS}->{$regex}; # has no x-type param
@@ -1119,7 +1121,7 @@
 	    $$MF[1] = $line;
 	    return length($thisDepth);
 	}
-	elsif (defined(@$entry)) {
+	elsif ('ARRAY' eq ref $entry && @$entry) {
 	    # already have an entry.  this is not a continuation.
 	    # save this line for the next call and exit.
 	    $$MF[1] = $line;


Reply to: