diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-04 12:52:07 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-04 12:52:07 +0000 |
| commit | ff9a24f6f7c576e129685ce59cd9e0a87925cef8 (patch) | |
| tree | fa051b68b874fc29e3a449f19f672a55c3a06c0d /py/objstr.c | |
| parent | a58cf679ee466b0bcd873603515a3ef293252b20 (diff) | |
| parent | 32f88410a153967af3f013d02a1a662aec19ec04 (diff) | |
| download | micropython-ff9a24f6f7c576e129685ce59cd9e0a87925cef8.tar.gz micropython-ff9a24f6f7c576e129685ce59cd9e0a87925cef8.zip | |
Merge remote-tracking branch 'upstream/master' into list_count
Diffstat (limited to 'py/objstr.c')
| -rw-r--r-- | py/objstr.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 |