X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.c;h=748888704c93069a5a85ef91e76a8fe457b63ad3;hb=2e5b50041f3643ca27385b211da60add40857ec8;hp=63530b31234e3467786cd58654e5566ece34743d;hpb=d5e98372e6efc414e818f1ed2d33156eb6ca6200;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/op.c b/op.c
index 63530b3..7488887 100644
--- a/op.c
+++ b/op.c
@@ -4325,7 +4325,7 @@ Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right)
 		      ((LISTOP*)right)->op_last->op_type == OP_CONST)
 		    {
 			SV *sv = ((SVOP*)((LISTOP*)right)->op_last)->op_sv;
-			if (SvIVX(sv) == 0)
+			if (SvIOK(sv) && SvIVX(sv) == 0)
 			    sv_setiv(sv, PL_modcount+1);
 		    }
 		}
@@ -5176,6 +5176,7 @@ S_looks_like_bool(pTHX_ const OP *o)
 
     switch(o->op_type) {
 	case OP_OR:
+	case OP_DOR:
 	    return looks_like_bool(cLOGOPo->op_first);
 
 	case OP_AND:
@@ -5191,7 +5192,6 @@ S_looks_like_bool(pTHX_ const OP *o)
 	case OP_ENTERSUB:
 
 	case OP_NOT:	case OP_XOR:
-	/* Note that OP_DOR is not here */
 
 	case OP_EQ:	case OP_NE:	case OP_LT:
 	case OP_GT:	case OP_LE:	case OP_GE:
@@ -5216,6 +5216,8 @@ S_looks_like_bool(pTHX_ const OP *o)
 	case OP_DEFINED: case OP_EXISTS:
 	case OP_MATCH:	 case OP_EOF:
 
+	case OP_FLOP:
+
 	    return TRUE;
 	
 	case OP_CONST:
@@ -5224,7 +5226,9 @@ S_looks_like_bool(pTHX_ const OP *o)
 	    ||  cSVOPo->op_sv == &PL_sv_no)
 	    
 		return TRUE;
-		
+	    else
+		return FALSE;
+
 	/* FALL THROUGH */
 	default:
 	    return FALSE;