X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=4e6d930ed215c9f0ae0852236d7329b82d250777;hb=ca9279baf07d6843f58a31f1ce3ff7dc875faf1a;hp=310ba50465ec1a2c866438208805f6bcf626227a;hpb=d69d2d9f0d14e0c849a4b59d442938c401a7f281;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index 310ba50..4e6d930 100644
--- a/sv.c
+++ b/sv.c
@@ -4501,6 +4501,8 @@ Efficient removal of characters from the beginning of the string buffer.
 SvPOK(sv) must be true and the C<ptr> must be a pointer to somewhere inside
 the string buffer.  The C<ptr> becomes the first character of the adjusted
 string. Uses the "OOK hack".
+Beware: after this function returns, C<ptr> and SvPVX(sv) may no longer
+refer to the same chunk of data.
 
 =cut
 */
@@ -4509,9 +4511,9 @@ void
 Perl_sv_chop(pTHX_ register SV *sv, register char *ptr)
 {
     register STRLEN delta;
-
     if (!ptr || !SvPOKp(sv))
 	return;
+    delta = ptr - SvPVX(sv);
     SV_CHECK_THINKFIRST(sv);
     if (SvTYPE(sv) < SVt_PVIV)
 	sv_upgrade(sv,SVt_PVIV);
@@ -4531,7 +4533,6 @@ Perl_sv_chop(pTHX_ register SV *sv, register char *ptr)
 	SvFLAGS(sv) |= SVf_OOK; 
     }
     SvNIOK_off(sv);
-    delta = ptr - SvPVX(sv);
     SvLEN(sv) -= delta;
     SvCUR(sv) -= delta;
     SvPVX(sv) += delta;
@@ -5917,13 +5918,13 @@ Perl_sv_pos_b2u(pTHX_ register SV* sv, I32* offsetp)
 	    mg = mg_find(sv, PERL_MAGIC_utf8);
 	    if (mg && mg->mg_ptr) {
 		cache = (STRLEN *) mg->mg_ptr;
-		if (cache[1] == *offsetp) {
+		if (cache[1] == (STRLEN)*offsetp) {
                     /* An exact match. */
                     *offsetp = cache[0];
 
 		    return;
 		}
-		else if (cache[1] < *offsetp) {
+		else if (cache[1] < (STRLEN)*offsetp) {
 		    /* We already know part of the way. */
 		    len = cache[0];
 		    s  += cache[1];
@@ -5946,12 +5947,16 @@ Perl_sv_pos_b2u(pTHX_ register SV* sv, I32* offsetp)
 
 			while (backw--) {
 			    p--;
-			    while (UTF8_IS_CONTINUATION(*p))
+			    while (UTF8_IS_CONTINUATION(*p)) {
 				p--;
+				backw--;
+			    }
 			    ubackw++;
 			}
 
 			cache[0] -= ubackw;
+			*offsetp = cache[0];
+			return;
 		    }
 		}
 	    }
@@ -9324,6 +9329,13 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	     p = SvEND(sv);
 	     *p = '\0';
 	}
+	/* Use memchr() instead of strchr(), as eptr is not guaranteed */
+	/* to point to a null-terminated string.                       */
+	if (left && ckWARN(WARN_PRINTF) && memchr(eptr, '\n', elen) && 
+	    (PL_op->op_type == OP_PRTF || PL_op->op_type == OP_SPRINTF)) 
+	    Perl_warner(aTHX_ packWARN(WARN_PRINTF),
+		"Newline in left-justified string for %sprintf",
+			(PL_op->op_type == OP_PRTF) ? "" : "s");
 	
 	have = esignlen + zeros + elen;
 	need = (have > width ? have : width);