From 7f59b4b2ca28179c72aa12f35fe59cb14017b5b0 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 4 Apr 2015 01:55:40 +0300
Subject: [PATCH] objstr: Fix bugs introduced by inability to have shadow
 variables.

Warnings lead to programming errors - as expected.
---
 py/objstr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/objstr.c b/py/objstr.c
index 4f032d38c..a7eb629be 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -519,8 +519,8 @@ STATIC inline mp_obj_t str_split_internal(mp_uint_t n_args, const mp_obj_t *args
                 s++;
             }
             mp_uint_t sub_len = s - start;
-            if (MP_LIKELY(!(len == 0 && s == top && (type && SPLITLINES)))) {
-                if (start + len != top && (type & KEEP)) {
+            if (MP_LIKELY(!(sub_len == 0 && s == top && (type && SPLITLINES)))) {
+                if (start + sub_len != top && (type & KEEP)) {
                     sub_len++;
                 }
                 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, sub_len));
-- 
GitLab