From ff3e5e3779ae6fab9f5d33149c95441eb847c196 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 1 Oct 2014 19:15:11 +0200 Subject: Fix unicode_aswidechar() for 4b unicode and 2b wchar_t (AIX). --- Misc/NEWS | 6 ++++++ Objects/unicodeobject.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 5b84414..14d9630 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -7,6 +7,12 @@ What's New in Python 3.2.6? *Release date: TBD* +Core and Builtins +----------------- + +- Issue #19529: Fix a potential crash in converting Unicode objects to wchar_t + when Py_UNICODE is 4 bytes but wchar_t is 2 bytes, for example on AIX. + Library ------- diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index cd4e9e9..b798850 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1267,7 +1267,7 @@ unicode_aswidechar(PyUnicodeObject *unicode, Py_ssize_t nchar; u = PyUnicode_AS_UNICODE(unicode); - uend = u + PyUnicode_GET_SIZE(u); + uend = u + PyUnicode_GET_SIZE(unicode); if (w != NULL) { worig = w; wend = w + size; -- cgit v0.12