M rbprompt.go → rbprompt.go

@@ -259,18 +259,25 @@ }
 	if *i < len(*f)-1 && (*f)[*i+1] == '#' {
 		*i++
 		var rgb hex
-		for k := 0; *i < len(*f) && k < 6; k++ {
+		k := 0
+		for ; *i < len(*f)-1 && k < 6; k++ {
 			*i++
 			if !rgb.readByte(k, (*f)[*i]) {
-				return errFn("parse error: invalid hex colour " + (*f)[j:*i])
+				goto parseError
 			}
 		}
+		if k < 6 {
+			goto parseError
+		}
 		*dst += rgb.escape(s)
 	} else {
 		*dst += (*rbfn)(s)
 	}
 	*i++
 	return nil
+parseError:
+	*i++
+	return errFn("parse error: invalid hex colour " + (*f)[j:*i])
 }
 
 // Next generates the next prompt string based on the format string and the current state of the PS struct.