From 2fc36b1645051f58ef56e0ac008be9f5eebc3237 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 6 Sep 2008 03:26:35 +0000
Subject: * transcode.c (stateless_encoding_i): ignore supplemental
 conversions.   Encoding::Converter.stateless_encoding("html-attr-escaped")
 should be   nil.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 transcode.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'transcode.c')

diff --git a/transcode.c b/transcode.c
index 3dbdb44d1..5c9e7d826 100644
--- a/transcode.c
+++ b/transcode.c
@@ -133,6 +133,8 @@ struct rb_econv_t {
  *  Dispatch data and logic
  */
 
+#define SUPPLEMENTAL_CONVERSION(sname, dname) (*(sname) == '\0' || *(dname) == '\0')
+
 typedef struct {
     const char *sname;
     const char *dname;
@@ -1635,7 +1637,11 @@ stateless_encoding_i(st_data_t key, st_data_t val, st_data_t arg)
 
     if (st_lookup(table2, (st_data_t)data->stateful_enc, &v)) {
         transcoder_entry_t *entry = (transcoder_entry_t *)v;
-        const rb_transcoder *tr = load_transcoder_entry(entry);
+        const rb_transcoder *tr;
+        if (SUPPLEMENTAL_CONVERSION(entry->sname, entry->dname)) {
+            return ST_CONTINUE;
+        }
+        tr = load_transcoder_entry(entry);
         if (tr && tr->stateful_type == stateful_encoder) {
             data->stateless_enc = tr->src_encoding;
             return ST_STOP;
-- 
cgit