From ae4f7c8e596eb224d8f24d21f8c87a10b98e07af Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 20 Nov 2011 18:28:55 +0100
Subject: [PATCH] charmap_encoding_error() uses the new Unicode API

---
 Objects/unicodeobject.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 90a4fcb62f..68e0586636 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8087,7 +8087,9 @@ charmap_encoding_error(
     PyObject *repunicode = NULL; /* initialize to prevent gcc warning */
     Py_ssize_t size, repsize;
     Py_ssize_t newpos;
-    Py_UNICODE *uni2;
+    enum PyUnicode_Kind kind;
+    void *data;
+    Py_ssize_t index;
     /* startpos for collecting unencodable chars */
     Py_ssize_t collstartpos = *inpos;
     Py_ssize_t collendpos = *inpos+1;
@@ -8201,10 +8203,18 @@ charmap_encoding_error(
             break;
         }
         /* generate replacement  */
+        if (PyUnicode_READY(repunicode) < 0) {
+            Py_DECREF(repunicode);
+            return -1;
+        }
         repsize = PyUnicode_GET_SIZE(repunicode);
-        for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) {
-            x = charmapencode_output(*uni2, mapping, res, respos);
+        data = PyUnicode_DATA(repunicode);
+        kind = PyUnicode_KIND(repunicode);
+        for (index = 0; index < repsize; index++) {
+            Py_UCS4 repch = PyUnicode_READ(kind, data, index);
+            x = charmapencode_output(repch, mapping, res, respos);
             if (x==enc_EXCEPTION) {
+                Py_DECREF(repunicode);
                 return -1;
             }
             else if (x==enc_FAILED) {
-- 
2.40.0