aboutsummaryrefslogtreecommitdiffstats
path: root/transcode.c
diff options
context:
space:
mode:
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c
index 7fb25601fc..ee6794d9be 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2470,13 +2470,13 @@ enc_arg(volatile VALUE *arg, const char **name_p, rb_encoding **enc_p)
int encidx;
VALUE encval;
- if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
+ if (((encidx = rb_to_encoding_index(encval = *arg)) < 0) ||
+ !(enc = rb_enc_from_index(encidx))) {
enc = NULL;
encidx = 0;
n = StringValueCStr(*arg);
}
else {
- enc = rb_enc_from_index(encidx);
n = rb_enc_name(enc);
}