X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.c;h=c22f73aa6570c9a9a2bd1864a4421ead091d06d9;hb=c1413a7f3faf8fb1e44dd192e26d2ae52b8817ce;hp=d64965d50986cd5b985c21b902b1aa6f86b8eaf6;hpb=e46c382ee1a26c0abddc80ad1249dc544d229d4e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.c b/gv.c
index d64965d..c22f73a 100644
--- a/gv.c
+++ b/gv.c
@@ -1,7 +1,7 @@
 /*    gv.c
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- *    2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others
+ *    2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -103,11 +103,6 @@ Perl_gv_IOadd(pTHX_ register GV *gv)
     }
 
     if (!GvIOp(gv)) {
-#ifdef GV_UNIQUE_CHECK
-        if (GvUNIQUE(gv)) {
-            Perl_croak(aTHX_ "Bad symbol for filehandle (GV is unique)");
-        }
-#endif
 	GvIOp(gv) = newIO();
     }
     return gv;
@@ -1863,12 +1858,13 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags)
       else if ( lex_mask && SvPOK(lex_mask) ) {
 	  /* we have an entry in the hints hash, check if method has been
 	   * masked by overloading.pm */
-	  const int offset = method / 8;
-	  const int bit    = method % 7;
 	  STRLEN len;
+	  const int offset = method / 8;
+	  const int bit    = method % 8;
 	  char *pv = SvPV(lex_mask, len);
 
-	  if ( (STRLEN)offset <= len && pv[offset] & ( 1 << bit ) )
+	  /* Bit set, so this overloading operator is disabled */
+	  if ( (STRLEN)offset < len && pv[offset] & ( 1 << bit ) )
 	      return NULL;
       }
   }
@@ -1982,6 +1978,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags)
 	   break;
 	 case int_amg:
 	 case iter_amg:			/* XXXX Eventually should do to_gv. */
+	 case ftest_amg:		/* XXXX Eventually should do to_gv. */
 	     /* FAIL safe */
 	     return NULL;	/* Delegate operation to standard mechanisms. */
 	     break;