need proper ruby exceptions when passing invalid encoding to format s…

…trings encoding for %c
headius · Nov 2, 2023 · 917474d · 917474d
1 parent f373339
commit 917474d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -599,6 +599,7 @@ private static void rubySprintfToBuffer(final ByteList buf, final CharSequence c
 
                 case 'c': {
                     arg = args.getArg();
+                    ThreadContext context = runtime.getCurrentContext();
 
                     int c; int n;
                     IRubyObject tmp = arg.checkStringType();
@@ -623,19 +624,19 @@ private static void rubySprintfToBuffer(final ByteList buf, final CharSequence c
                     }
                     if ((flags & FLAG_WIDTH) == 0) {
                         buf.ensure(buf.length() + n);
-                        EncodingUtils.encMbcput(c, buf.unsafeBytes(), buf.realSize(), encoding);
+                        EncodingUtils.encMbcput(context, c, buf.unsafeBytes(), buf.realSize(), encoding);
                         buf.realSize(buf.realSize() + n);
                     }
                     else if ((flags & FLAG_MINUS) != 0) {
                         buf.ensure(buf.length() + n);
-                        EncodingUtils.encMbcput(c, buf.unsafeBytes(), buf.realSize(), encoding);
+                        EncodingUtils.encMbcput(context, c, buf.unsafeBytes(), buf.realSize(), encoding);
                         buf.realSize(buf.realSize() + n);
                         buf.fill(' ', width - 1);
                     }
                     else {
                         buf.fill(' ', width - 1);
                         buf.ensure(buf.length() + n);
-                        EncodingUtils.encMbcput(c, buf.unsafeBytes(), buf.realSize(), encoding);
+                        EncodingUtils.encMbcput(context, c, buf.unsafeBytes(), buf.realSize(), encoding);
                         buf.realSize(buf.realSize() + n);
                     }
                     offset++;

diff --git a/spec/tags/ruby/core/kernel/sprintf_tags.txt b/spec/tags/ruby/core/kernel/sprintf_tags.txt
diff --git a/spec/tags/ruby/core/string/modulo_tags.txt b/spec/tags/ruby/core/string/modulo_tags.txt