From 0c270a8bb748f09b7de6f6ce21d405e0c83be329 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 9 Jan 2013 09:52:01 -0600
Subject: [PATCH] correct static string clearing loop (closes #16906)

---
 Misc/NEWS               |  3 +++
 Objects/unicodeobject.c | 13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index e3fd61c8911..6ed6101635b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.3.1?
 Core and Builtins
 -----------------
 
+- Issue #16906: Fix a logic error that prevented most static strings from being
+  cleared.
+
 - Issue #11461: Fix the incremental UTF-16 decoder. Original patch by
   Amaury Forgeot d'Arc.
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b4fc0040b6e..16d59292eff 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1826,12 +1826,15 @@ _PyUnicode_FromId(_Py_Identifier *id)
 void
 _PyUnicode_ClearStaticStrings()
 {
-    _Py_Identifier *i;
-    for (i = static_strings; i; i = i->next) {
-        Py_DECREF(i->object);
-        i->object = NULL;
-        i->next = NULL;
+    _Py_Identifier *tmp, *s = static_strings;
+    while (s) {
+        Py_DECREF(s->object);
+        s->object = NULL;
+        tmp = s->next;
+        s->next = NULL;
+        s = tmp;
     }
+    static_strings = NULL;
 }
 
 /* Internal function, doesn't check maximum character */