commit 7ed9c4c9102e2098bdbb80456f30e20fb4a9ab90
author Victor Stinner <victor.stinner@haypocalc.com> Thu Mar 04 12:14:57 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Thu Mar 04 12:14:57 2010 +0000
tree 71ca738286f473db8fb84489f6ba1db335374b65
parent 2e5432e4c19f160b13b628cce38879bbf0175b19

Merged revisions 78646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78646 | victor.stinner | 2010-03-04 13:09:33 +0100 (jeu., 04 mars 2010) | 5 lines

  Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review
  Issue #29.

  PR #29 was released in february 2004!
........

Modules/unicodedata.c

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 90e94aa..ecd744a 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -684,7 +684,7 @@
       comb = 0;
       while (i1 < end) {
           int comb1 = _getrecord_ex(*i1)->combining;
-          if (comb1 && comb == comb1) {
+          if (comb && (comb1 == 0 || comb == comb1)) {
               /* Character is blocked. */
               i1++;
               continue;