diff options
| author | Guido van Rossum <guido@python.org> | 1997-02-14 22:58:07 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-02-14 22:58:07 +0000 |
| commit | 73b5fcda7405afb21a32bd6845e768b7b78a0cb1 (patch) | |
| tree | 0454acd7d4e331242cf13e6d52d1736f1ba76381 /Python/marshal.c | |
| parent | eb3d19651061ba47cafdda175fd3ffe855681809 (diff) | |
| download | cpython-73b5fcda7405afb21a32bd6845e768b7b78a0cb1.tar.gz | |
Changes for Lee Busby's SIGFPE patch set.
New file pyfpe.c and exception FloatingPointError.
Surround some f.p. operations with PyFPE macro brackets.
Diffstat (limited to 'Python/marshal.c')
| -rw-r--r-- | Python/marshal.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Python/marshal.c b/Python/marshal.c index 0ad493a3db..f4634f013b 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -412,6 +412,7 @@ r_object(p) { extern double atof PROTO((const char *)); char buf[256]; + double dx; n = r_byte(p); if (r_string(buf, (int)n, p) != n) { err_setstr(EOFError, @@ -419,7 +420,10 @@ r_object(p) return NULL; } buf[n] = '\0'; - return newfloatobject(atof(buf)); + PyFPE_START_PROTECT("atof", return 0) + dx = atof(buf); + PyFPE_END_PROTECT + return newfloatobject(dx); } #ifndef WITHOUT_COMPLEX @@ -435,7 +439,9 @@ r_object(p) return NULL; } buf[n] = '\0'; + PyFPE_START_PROTECT("atof", return 0) c.real = atof(buf); + PyFPE_END_PROTECT n = r_byte(p); if (r_string(buf, (int)n, p) != n) { err_setstr(EOFError, @@ -443,7 +449,9 @@ r_object(p) return NULL; } buf[n] = '\0'; + PyFPE_START_PROTECT("atof", return 0) c.imag = atof(buf); + PyFPE_END_PROTECT return newcomplexobject(c); } #endif |