kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix some UBSAN false positives (#6115)

Browse source 
* Fix some UBSAN false positives.
* ruby tool/update-deps --fix
This commit is contained in:
Kevin Backhouse 2022-07-12 19:48:10 +01:00 committed by GitHub
parent 8309b1366c
commit 8c1808151f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2022-07-13 03:48:32 +09:00 
Merged-By: jhawthorn <john@hawthorn.email>
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.mk
View file

@ -12898,10 +12898,14 @@ regexec.$(OBJEXT): {$(VPATH)}st.h
regexec.$(OBJEXT): {$(VPATH)}subst.h regexec.$(OBJEXT): {$(VPATH)}subst.h
regparse.$(OBJEXT): $(hdrdir)/ruby.h regparse.$(OBJEXT): $(hdrdir)/ruby.h
regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
regparse.$(OBJEXT): $(top_srcdir)/internal/compilers.h
regparse.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
regparse.$(OBJEXT): $(top_srcdir)/internal/warnings.h
regparse.$(OBJEXT): {$(VPATH)}assert.h regparse.$(OBJEXT): {$(VPATH)}assert.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/assume.h regparse.$(OBJEXT): {$(VPATH)}backward/2/assume.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h regparse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/bool.h regparse.$(OBJEXT): {$(VPATH)}backward/2/bool.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h regparse.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/limits.h regparse.$(OBJEXT): {$(VPATH)}backward/2/limits.h
regparse.$(OBJEXT): {$(VPATH)}backward/2/long_long.h regparse.$(OBJEXT): {$(VPATH)}backward/2/long_long.h

2
include/ruby/internal/arithmetic/long.h
View file

@ -115,7 +115,7 @@ RB_INT2FIX(long i)
/* :NOTE: VALUE can be wider than long. As j being unsigned, 2j+1 is fully /* :NOTE: VALUE can be wider than long. As j being unsigned, 2j+1 is fully
* defined. Also it can be compiled into a single LEA instruction. */ * defined. Also it can be compiled into a single LEA instruction. */
const unsigned long j = i; const unsigned long j = i;
const unsigned long k = 2 * j + RUBY_FIXNUM_FLAG; const unsigned long k = (j << 1) + RUBY_FIXNUM_FLAG;
const long l = k; const long l = k;
const SIGNED_VALUE m = l; /* Sign extend */ const SIGNED_VALUE m = l; /* Sign extend */
const VALUE n = m; const VALUE n = m;

6
parse.y
View file

@ -232,12 +232,12 @@ enum {
}; };
#define NUMPARAM_ID_P(id) numparam_id_p(id) #define NUMPARAM_ID_P(id) numparam_id_p(id)
#define NUMPARAM_ID_TO_IDX(id) (unsigned int)(((id) >> ID_SCOPE_SHIFT) - tNUMPARAM_1 + 1) #define NUMPARAM_ID_TO_IDX(id) (unsigned int)(((id) >> ID_SCOPE_SHIFT) - (tNUMPARAM_1 - 1))
#define NUMPARAM_IDX_TO_ID(idx) TOKEN2LOCALID((tNUMPARAM_1 + (idx) - 1)) #define NUMPARAM_IDX_TO_ID(idx) TOKEN2LOCALID((tNUMPARAM_1 - 1 + (idx)))
static int static int
numparam_id_p(ID id) numparam_id_p(ID id)
{ {
if (!is_local_id(id)) return 0; if (!is_local_id(id) || id < (tNUMPARAM_1 << ID_SCOPE_SHIFT)) return 0;
unsigned int idx = NUMPARAM_ID_TO_IDX(id); unsigned int idx = NUMPARAM_ID_TO_IDX(id);
return idx > 0 && idx <= NUMPARAM_MAX; return idx > 0 && idx <= NUMPARAM_MAX;
} }

3
regparse.c
View file

@ -37,6 +37,7 @@
#include "regparse.h" #include "regparse.h"
#include <stdarg.h> #include <stdarg.h>
#include "internal/sanitizers.h"
#define WARN_BUFSIZE 256 #define WARN_BUFSIZE 256
@ -394,6 +395,8 @@ str_end_cmp(st_data_t xp, st_data_t yp)
return 0; return 0;
} }
NO_SANITIZE("unsigned-integer-overflow", static st_index_t str_end_hash(st_data_t xp));
static st_index_t static st_index_t
str_end_hash(st_data_t xp) str_end_hash(st_data_t xp)
{ {