Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.3.

This commit is contained in:
Stefan Krah 2013-12-15 20:52:08 +01:00
parent b2a794d235 1f1ec12db9
commit ae01a8bcdf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/_decimal/libmpdec/mpdecimal.c
View File

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