[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3.

[stefan.krah]

http://hg.python.org/cpython/rev/936b35acec50
changeset:   87969:936b35acec50
parent:      87966:6cb93e45a3be
parent:      87968:274b293435fb
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Dec 15 20:52:08 2013 +0100
summary:
  Merge from 3.3.

files:
  Modules/_decimal/libmpdec/mpdecimal.c |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -4421,21 +4421,22 @@
          const mpd_context_t *ctx, uint32_t *status)
 {
     uint32_t workstatus = 0;
-    const mpd_t *cc = c;
+    mpd_t *cc = NULL;
 
     if (result == c) {
         if ((cc = mpd_qncopy(c)) == NULL) {
             mpd_seterror(result, MPD_Malloc_error, status);
             return;
         }
+        c = cc;
     }
 
     _mpd_qmul(result, a, b, ctx, &workstatus);
     if (!(workstatus&MPD_Invalid_operation)) {
-        mpd_qadd(result, result, cc, ctx, &workstatus);
-    }
-
-    if (cc != c) mpd_del((mpd_t *)cc);
+        mpd_qadd(result, result, c, ctx, &workstatus);
+    }
+
+    if (cc) mpd_del(cc);
     *status |= workstatus;
 }
 

-- 
Repository URL: http://hg.python.org/cpython