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

Arg check width and height into Shape.

Browse Source 
Fixes #1537
This commit is contained in:
Scott Shawcroft 2019-02-13 17:34:39 -08:00
parent a1a4959071
commit b13adfc228
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared-bindings/bleio/CharacteristicBuffer.c
View File

@ -76,7 +76,7 @@ STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type,
const int buffer_size = args[ARG_buffer_size].u_int; const int buffer_size = args[ARG_buffer_size].u_int;
if (buffer_size < 1) { if (buffer_size < 1) {
mp_raise_ValueError(translate("buffer_size must be >= 1")); mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_buffer_size);
} }
if (!MP_OBJ_IS_TYPE(characteristic, &bleio_characteristic_type)) { if (!MP_OBJ_IS_TYPE(characteristic, &bleio_characteristic_type)) {

13
shared-bindings/displayio/Shape.c
View File

@ -64,11 +64,20 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
mp_int_t width = args[ARG_width].u_int;
if (width < 1) {
mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_width);
}
mp_int_t height = args[ARG_height].u_int;
if (height < 1) {
mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_height);
}
displayio_shape_t *self = m_new_obj(displayio_shape_t); displayio_shape_t *self = m_new_obj(displayio_shape_t);
self->base.type = &displayio_shape_type; self->base.type = &displayio_shape_type;
common_hal_displayio_shape_construct(self, common_hal_displayio_shape_construct(self,
args[ARG_width].u_int, width,
args[ARG_height].u_int, height,
args[ARG_mirror_x].u_bool, args[ARG_mirror_x].u_bool,
args[ARG_mirror_y].u_bool); args[ARG_mirror_y].u_bool);