diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-13 09:34:49 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-13 12:46:48 +0900 |
| commit | fce667ed08f25fa7ce43c9b07be170f341a04c4e (patch) | |
| tree | 56afed76806c5c6793040de5c00f7acc72c30a59 /encoding.c | |
| parent | b1b155ff03634ade5cc0e724529841d354d54033 (diff) | |
| download | ruby-fce667ed08f25fa7ce43c9b07be170f341a04c4e.tar.gz | |
Get rid of warnings/exceptions at cleanup
After the encoding index instance variable is removed when all
instance variables are removed in `obj_free`, then `rb_str_free`
causes uninitialized instance variable warning and nil-to-integer
conversion exception. Both cases result in object allocation
during GC, and crashes.
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index f2e67ff508..e713b0a922 100644 --- a/encoding.c +++ b/encoding.c @@ -779,8 +779,18 @@ enc_get_index_str(VALUE str) if (i == ENCODING_INLINE_MAX) { VALUE iv; +#if 0 iv = rb_ivar_get(str, rb_id_encoding()); i = NUM2INT(iv); +#else + /* + * Tentatively, assume ASCII-8BIT, if encoding index instance + * variable is not found. This can happen when freeing after + * all instance variables are removed in `obj_free`. + */ + iv = rb_attr_get(str, rb_id_encoding()); + i = NIL_P(iv) ? ENCINDEX_ASCII : NUM2INT(iv); +#endif } return i; } |