From f9540e53e72c3b455708a05e5ff5c7a552a5a733 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Wed, 10 Feb 2016 15:45:47 +0100
Subject: [PATCH] Fix #15: prevent ISO-2022-JP encoder attack

---
 Overview.html     | 12 +++++++++++-
 Overview.src.html | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Overview.html b/Overview.html
index e1bca46..3a0031c 100644
--- a/Overview.html
+++ b/Overview.html
@@ -7,7 +7,7 @@
 
 <p><a class="logo" href="https://whatwg.org/"><img alt="WHATWG" height="100" src="https://resources.whatwg.org/logo-encoding.svg" width="100"></a></p>
 <h1>Encoding</h1>
-<h2 class="no-num no-toc" id="living-standard-—-last-updated-10-february-2016">Living Standard — Last Updated 10 February 2016</h2>
+<h2 class="no-num no-toc" id="living-standard-—-last-updated-12-february-2016">Living Standard — Last Updated 12 February 2016</h2>
 
 <dl>
  <dt>Participate:
@@ -2314,6 +2314,15 @@ <h4 id="iso-2022-jp-encoder"><span class="secno">13.2.2 </span><dfn>ISO-2022-JP
  <a href="#iso-2022-jp-encoder-state">ISO-2022-JP encoder state</a> is
  <a href="#iso-2022-jp-encoder-ascii" title="iso-2022-jp encoder ASCII">ASCII</a>, return <a href="#finished">finished</a>.
 
+ <li>
+  <p>If <a href="#iso-2022-jp-encoder-state">ISO-2022-JP encoder state</a> is
+  <a href="#iso-2022-jp-encoder-ascii" title="iso-2022-jp encoder ASCII">ASCII</a> or
+  <a href="#iso-2022-jp-encoder-roman" title="iso-2022-jp encoder Roman">Roman</a>, and <var>code point</var> is U+000E, U+000F,
+  or U+001B, return <a href="#error">error</a> with U+FFFD.
+
+  <p class="note">This returns U+FFFD rather than the <var>code point</var> to prevent attacks.
+  <!-- https://github.com/whatwg/encoding/issues/15 -->
+
  <li><p>If <a href="#iso-2022-jp-encoder-state">ISO-2022-JP encoder state</a> is
  <a href="#iso-2022-jp-encoder-ascii" title="iso-2022-jp encoder ASCII">ASCII</a> and <var>code point</var> is an
  <a href="#ascii-code-point">ASCII code point</a>, return a byte whose value is <var>code point</var>.
@@ -2904,6 +2913,7 @@ <h2 class="no-num" id="acknowledgments">Acknowledgments</h2>
 Simon Montagu,
 Simon Pieters,
 Simon Sapin,
+寺田健 (Takeshi Terada),
 Vyacheslav Matva, and
 成瀬ゆい (Yui Naruse)
 for being awesome.
diff --git a/Overview.src.html b/Overview.src.html
index 3a34017..d66d955 100644
--- a/Overview.src.html
+++ b/Overview.src.html
@@ -2228,6 +2228,15 @@ <h4><dfn>ISO-2022-JP encoder</dfn></h4>
  <span>ISO-2022-JP encoder state</span> is
  <span title="iso-2022-jp encoder ASCII">ASCII</span>, return <span>finished</span>.
 
+ <li>
+  <p>If <span>ISO-2022-JP encoder state</span> is
+  <span title="iso-2022-jp encoder ASCII">ASCII</span> or
+  <span title="iso-2022-jp encoder Roman">Roman</span>, and <var>code point</var> is U+000E, U+000F,
+  or U+001B, return <span>error</span> with U+FFFD.
+
+  <p class="note">This returns U+FFFD rather than the <var>code point</var> to prevent attacks.
+  <!-- https://github.com/whatwg/encoding/issues/15 -->
+
  <li><p>If <span>ISO-2022-JP encoder state</span> is
  <span title="iso-2022-jp encoder ASCII">ASCII</span> and <var>code point</var> is an
  <span>ASCII code point</span>, return a byte whose value is <var>code point</var>.
@@ -2797,6 +2806,7 @@ <h2 class=no-num>Acknowledgments</h2>
 Simon Montagu,
 Simon Pieters,
 Simon Sapin,
+寺田健 (Takeshi Terada),
 Vyacheslav Matva, and
 成瀬ゆい (Yui Naruse)
 for being awesome.