head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.40
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.38
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.36
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.34
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.32
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.30
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.28
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.26
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.24
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.22
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.20
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.18
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.16
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.14
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.12
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.10
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.8
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.6
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.4
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.2
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.1.0.10
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.8
	pkgsrc-2005Q1-base:1.1
	pkgsrc-2004Q4:1.1.0.6
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.4
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.2
	pkgsrc-2004Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.08.29.16.10.28;	author taca;	state dead;
branches;
next	1.1;

1.1
date	2004.04.29.17.20.44;	author taca;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update p5-File-MMagic to 1.25.

Changes from 1.22:

2005-08-27  NOKUBI Takatsugu  <knok@@daionet.gr.jp>

	* Version 1.25.

	* Moved Build.PL to contrib directory.

2005-08-01  NOKUBI Takatsugu  <knok@@daionet.gr.jp>

	* Version 1.24.

	* MMagic.pm (check_binary): Removed brackets, closes #13535.
	  (Reported by dakkar, thank you)

2005-07-29  NOKUBI Takatsugu  <knok@@daionet.gr.jp>

	* MMagic.pm: Version 1.23.

2004-04-21  NOKUBI Takatsugu  <knok@@daionet.gr.jp>

	* MMagic.pm (magicMatchStr): Added a length check.
	  Reported by Tadamasa Teranishi, thank you.

2004-03-17  NOKUBI Takatsugu  <knok@@daionet.gr.jp>

	* Build.PL: Added.
	  Contributed by Ryuji Abe, thank you.
@
text
@$NetBSD: patch-aa,v 1.1 2004/04/29 17:20:44 taca Exp $

--- MMagic.pm.orig	2004-03-15 17:23:04.000000000 +0900
+++ MMagic.pm
@@@@ -985,6 +985,8 @@@@ sub magicMatchStr {
     else {
 	#numeric
 
+	return if (length($str) < 4);
+
 	# read up to 4 bytes
 	$data = substr($str, 0, 4);
 
@


1.1
log
@Add patch-aa I've forgot to commit.
@
text
@d1 1
a1 1
$NetBSD$
@