djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

objstr: Make sure that bytes are indexed as bytes, not as unicode. 

Fixes #795.
This commit is contained in:
Paul Sokolovsky 2014-08-11 22:36:38 +03:00
parent 6e6bcccdc1
commit 9749b2fb0d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
py/objstr.c
View File

@ -353,7 +353,8 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, u
} }
#endif #endif
STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { // This is used for both bytes and 8-bit strings. This is not used for unicode strings.
STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
mp_obj_type_t *type = mp_obj_get_type(self_in); mp_obj_type_t *type = mp_obj_get_type(self_in);
GET_STR_DATA_LEN(self_in, self_data, self_len); GET_STR_DATA_LEN(self_in, self_data, self_len);
if (value == MP_OBJ_SENTINEL) { if (value == MP_OBJ_SENTINEL) {
@ -368,11 +369,11 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start); return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
} }
#endif #endif
const byte *p = str_index_to_ptr(type, self_data, self_len, index, false); mp_uint_t index_val = mp_get_index(type, self_len, index, false);
if (type == &mp_type_bytes) { if (type == &mp_type_bytes) {
return MP_OBJ_NEW_SMALL_INT(*p); return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
} else { } else {
return mp_obj_new_str((char*)p, 1, true); return mp_obj_new_str((char*)&self_data[index_val], 1, true);
} }
} else { } else {
return MP_OBJ_NULL; // op not supported return MP_OBJ_NULL; // op not supported
@ -1704,7 +1705,7 @@ const mp_obj_type_t mp_type_str = {
.print = str_print, .print = str_print,
.make_new = str_make_new, .make_new = str_make_new,
.binary_op = mp_obj_str_binary_op, .binary_op = mp_obj_str_binary_op,
.subscr = str_subscr, .subscr = bytes_subscr,
.getiter = mp_obj_new_str_iterator, .getiter = mp_obj_new_str_iterator,
.buffer_p = { .get_buffer = mp_obj_str_get_buffer }, .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
.locals_dict = (mp_obj_t)&str_locals_dict, .locals_dict = (mp_obj_t)&str_locals_dict,
@ -1718,7 +1719,7 @@ const mp_obj_type_t mp_type_bytes = {
.print = str_print, .print = str_print,
.make_new = bytes_make_new, .make_new = bytes_make_new,
.binary_op = mp_obj_str_binary_op, .binary_op = mp_obj_str_binary_op,
.subscr = str_subscr, .subscr = bytes_subscr,
.getiter = mp_obj_new_bytes_iterator, .getiter = mp_obj_new_bytes_iterator,
.buffer_p = { .get_buffer = mp_obj_str_get_buffer }, .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
.locals_dict = (mp_obj_t)&str_locals_dict, .locals_dict = (mp_obj_t)&str_locals_dict,

5
tests/basics/bytes.py
View File

@ -37,3 +37,8 @@ def gen():
for i in range(4): for i in range(4):
yield i yield i
print(bytes(gen())) print(bytes(gen()))
# Make sure bytes are not mistreated as unicode
x = b"\xff\x8e\xfe}\xfd\x7f"
print(len(x))
print(x[0], x[1], x[2], x[3])