From 6ee1e383d6b95d0bb5f2902ec91b8d831e4b5803 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 4 Jan 2014 03:47:34 +0200
Subject: str slice: Trim slice indexes to be in range.

---
 py/objstr.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'py')

diff --git a/py/objstr.c b/py/objstr.c
index 59547e3cd6..54e6f37705 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -41,9 +41,20 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
                 int len = strlen(lhs_str);
                 if (start < 0) {
                     start = len + start;
+                    if (start < 0) {
+                        start = 0;
+                    }
+                } else if (start > len) {
+                    start = len;
                 }
                 if (stop <= 0) {
                     stop = len + stop;
+                    // CPython returns empty string in such case
+                    if (stop < 0) {
+                        stop = start;
+                    }
+                } else if (stop > len) {
+                    stop = len;
                 }
                 return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start));
 #endif
-- 
cgit v1.2.3