From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 17 Dec 2005 11:44:47 +0000 (+0000)
Subject: The THINKFIRST check after the GMAGICAL check in sv_2iv_flags and
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4cb1ec55c1e2db383f2cc2e1c02c9ba36503a201;p=p5sagit%2Fp5-mst-13.2.git

The THINKFIRST check after the GMAGICAL check in sv_2iv_flags and
sv_2uv_flags should have been else if.

p4raw-id: //depot/perl@26385
---

diff --git a/sv.c b/sv.c
index f918d5a..f81f56f 100644
--- a/sv.c
+++ b/sv.c
@@ -1915,8 +1915,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags)
 	}
 	assert(SvTYPE(sv) >= SVt_PVMG);
 	/* This falls through to the report_uninit inside S_sv_2iuv_common.  */
-    }
-    if (SvTHINKFIRST(sv)) {
+    } else if (SvTHINKFIRST(sv)) {
 	if (SvROK(sv)) {
 	return_rok:
 	    if (SvAMAGIC(sv)) {
@@ -1989,8 +1988,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags)
 	}
 	assert(SvTYPE(sv) >= SVt_PVMG);
 	/* This falls through to the report_uninit inside S_sv_2iuv_common.  */
-    }
-    if (SvTHINKFIRST(sv)) {
+    } else if (SvTHINKFIRST(sv)) {
 	if (SvROK(sv)) {
 	return_rok:
 	    if (SvAMAGIC(sv)) {