Format and test limited encoding

ohler55 · Jan 11, 2025 · f53e3aa · f53e3aa
1 parent e05471a
commit f53e3aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/ext/ox/parse.c b/ext/ox/parse.c
@@ -343,14 +343,14 @@ static void read_instruction(PInfo pi) {
             pi->pcb->instruct(pi, target, attrs.head, content_ptr);
         }
     } else {
-	for (Attr a = attrs.head; a < attrs.tail; a++) {
-	    if (0 == strcasecmp(a->name, "encoding")) {
-		strncpy(pi->options->encoding, a->value, sizeof(pi->options->encoding) - 1);
-		pi->options->encoding[sizeof(pi->options->encoding) - 1] = '\0';
-		pi->options->rb_enc = rb_enc_find(a->value);
-		break;
-	    }
-	}
+        for (Attr a = attrs.head; a < attrs.tail; a++) {
+            if (0 == strcasecmp(a->name, "encoding")) {
+                strncpy(pi->options->encoding, a->value, sizeof(pi->options->encoding) - 1);
+                pi->options->encoding[sizeof(pi->options->encoding) - 1] = '\0';
+                pi->options->rb_enc = rb_enc_find(a->value);
+                break;
+            }
+        }
     }
     attr_stack_cleanup(&attrs);
     if (content_ptr != content) {

diff --git a/test/tests.rb b/test/tests.rb
@@ -1932,6 +1932,14 @@ def dump_and_load(obj, trace=false, circular=false)
     end
     loaded
   end
+
+  def test_limit_encoding
+    Ox.default_options = $ox_object_options
+    xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><doc><name>Martin</name></doc>".encode('ASCII-8BIT')
+    enc = Ox.load(xml, mode: :limited).locate('name').first.text.encoding
+    assert_equal('UTF-8', enc.to_s)
+  end
+
 end
 
 class Bag