StackRduino
diff --git a/‎py/objstr.c‎
Lines changed: 2 additions & 2 deletions b/‎py/objstr.c‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/basics/string_strip.py‎
Lines changed: 11 additions & 0 deletions b/‎tests/basics/string_strip.py‎
Lines changed: 11 additions & 0 deletions
@@ -667,6 +667,7 @@ STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
     for (machine_uint_t len = orig_str_len; len > 0; len--) {
         if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
             if (!first_good_char_pos_set) {
+                first_good_char_pos_set = true;
                 first_good_char_pos = i;
                 if (type == LSTRIP) {
                     last_good_char_pos = orig_str_len - 1;
@@ -676,14 +677,13 @@ STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
                     last_good_char_pos = i;
                     break;
                 }
-                first_good_char_pos_set = true;
             }
             last_good_char_pos = i;
         }
         i += delta;
     }
 
-    if (first_good_char_pos == 0 && last_good_char_pos == 0) {
+    if (!first_good_char_pos_set) {
         // string is all whitespace, return ''
         return MP_OBJ_NEW_QSTR(MP_QSTR_);
     }
 
@@ -20,3 +20,14 @@
     print('mississippi'.rstrip(b'ipz'))
 except TypeError:
     print("TypeError")
+
+# single-char subj string used to give a problem
+print("a".strip())
+print("a".lstrip())
+print("a".rstrip())
+print(" a".strip())
+print(" a".lstrip())
+print(" a".rstrip())
+print("a ".strip())
+print("a ".lstrip())
+print("a ".rstrip())
Original file line number	Diff line number	Diff line change
`@@ -667,6 +667,7 @@ STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {`
`667`	`667`	`for (machine_uint_t len = orig_str_len; len > 0; len--) {`
`668`	`668`	`if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {`
`669`	`669`	`if (!first_good_char_pos_set) {`
	`670`	`+ first_good_char_pos_set = true;`
`670`	`671`	`first_good_char_pos = i;`
`671`	`672`	`if (type == LSTRIP) {`
`672`	`673`	`last_good_char_pos = orig_str_len - 1;`
`@@ -676,14 +677,13 @@ STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {`
`676`	`677`	`last_good_char_pos = i;`
`677`	`678`	`break;`
`678`	`679`	`}`
`679`		`- first_good_char_pos_set = true;`
`680`	`680`	`}`
`681`	`681`	`last_good_char_pos = i;`
`682`	`682`	`}`
`683`	`683`	`i += delta;`
`684`	`684`	`}`
`685`	`685`
`686`		`- if (first_good_char_pos == 0 && last_good_char_pos == 0) {`
	`686`	`+ if (!first_good_char_pos_set) {`
`687`	`687`	`// string is all whitespace, return ''`
`688`	`688`	`return MP_OBJ_NEW_QSTR(MP_QSTR_);`
`689`	`689`	`}`