1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/yarp] Prevent reading/writing outside the bounds of options

Browse Source 
https://github.com/ruby/yarp/commit/52bed3cbe2
This commit is contained in:
Steven Johnstone 2023-06-23 22:06:03 +01:00 committed by git
parent 44197e51dc
commit 4fc8b8f06d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yarp/regexp.c
View File

@ -272,13 +272,16 @@ typedef enum {
YP_REGEXP_OPTION_STATE_ADDABLE
} yp_regexp_option_state_t;
enum {
option_slots = 128
};
// This is the set of options that are configurable on the regular expression.
typedef yp_regexp_option_state_t yp_regexp_options_t[128];
typedef yp_regexp_option_state_t yp_regexp_options_t[option_slots];
// Initialize a new set of options to their default values.
static void
yp_regexp_options_init(yp_regexp_options_t *options) {
memset(options, YP_REGEXP_OPTION_STATE_INVALID, sizeof(yp_regexp_option_state_t) * 128);
memset(options, YP_REGEXP_OPTION_STATE_INVALID, sizeof(yp_regexp_option_state_t) * option_slots);
(*options)['i'] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
(*options)['m'] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
(*options)['x'] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
@ -291,6 +294,9 @@ yp_regexp_options_init(yp_regexp_options_t *options) {
// added, false if it was already present.
static bool
yp_regexp_options_add(yp_regexp_options_t *options, unsigned char option) {
if (option >= option_slots) {
return false;
}
switch ((*options)[option]) {
case YP_REGEXP_OPTION_STATE_INVALID:
return false;
@ -306,6 +312,9 @@ yp_regexp_options_add(yp_regexp_options_t *options, unsigned char option) {
// it was removed, false if it was already absent.
static bool
yp_regexp_options_remove(yp_regexp_options_t *options, unsigned char option) {
if (option >= option_slots) {
return false;
}
switch ((*options)[option]) {
case YP_REGEXP_OPTION_STATE_INVALID:
case YP_REGEXP_OPTION_STATE_ADDABLE: