X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Name.xs;h=9a4d4939872749b2d634a019a76b5dd8d16dd361;hb=4a3201daca5022e50a4ce0ab36016a5a7ed76c96;hp=6168073e1271904005aa65d257c6e2ee049ae12e;hpb=9f60da160aa978c8bb651127e83caf3681e50ca5;p=p5sagit%2FSub-Name.git

diff --git a/Name.xs b/Name.xs
index 6168073..9a4d493 100644
--- a/Name.xs
+++ b/Name.xs
@@ -40,8 +40,8 @@ subname(name, sub)
 	const char *s, *end = NULL, *begin = NULL;
 	MAGIC *mg;
 	STRLEN namelen;
-	int utf8flag = SvUTF8(name);
 	const char* nameptr = SvPV(name, namelen);
+	int utf8flag = SvUTF8(name);
 	int seen_quote = 0, need_subst = 0;
     PPCODE:
 	if (!SvROK(sub) && SvGMAGICAL(sub))
@@ -63,13 +63,13 @@ subname(name, sub)
 		croak("Not a subroutine reference");
 
 	for (s = nameptr; s <= nameptr + namelen; s++) {
-		if (*s == ':' && s[-1] == ':') {
+		if (s > nameptr && *s == ':' && s[-1] == ':') {
 			end = s - 1;
 			begin = ++s;
 			if (seen_quote)
 				need_subst++;
 		}
-		else if (*s && s[-1] == '\'') {
+		else if (s > nameptr && *s != '\0' && s[-1] == '\'') {
 			end = s - 1;
 			begin = s;
 			if (seen_quote++)