@@ -746,23 +746,28 @@ r_string(Py_ssize_t n, RFILE *p)
746746static int
747747r_byte (RFILE * p )
748748{
749- int c = EOF ;
750-
751749 if (p -> ptr != NULL ) {
752- if (p -> ptr < p -> end )
753- c = (unsigned char ) * p -> ptr ++ ;
754- return c ;
750+ if (p -> ptr < p -> end ) {
751+ return (unsigned char ) * p -> ptr ++ ;
752+ }
755753 }
756- if (!p -> readable ) {
754+ else if (!p -> readable ) {
757755 assert (p -> fp );
758- c = getc (p -> fp );
756+ int c = getc (p -> fp );
757+ if (c != EOF ) {
758+ return c ;
759+ }
759760 }
760761 else {
761762 const char * ptr = r_string (1 , p );
762- if (ptr != NULL )
763- c = * (const unsigned char * ) ptr ;
763+ if (ptr != NULL ) {
764+ return * (const unsigned char * ) ptr ;
765+ }
766+ return EOF ;
764767 }
765- return c ;
768+ PyErr_SetString (PyExc_EOFError ,
769+ "EOF read where not expected" );
770+ return EOF ;
766771}
767772
768773static int
@@ -823,10 +828,10 @@ r_PyLong(RFILE *p)
823828 digit d ;
824829
825830 n = r_long (p );
826- if (PyErr_Occurred ())
827- return NULL ;
828831 if (n == 0 )
829832 return (PyObject * )_PyLong_New (0 );
833+ if (n == -1 && PyErr_Occurred ())
834+ return NULL ;
830835 if (n < - SIZE32_MAX || n > SIZE32_MAX ) {
831836 PyErr_SetString (PyExc_ValueError ,
832837 "bad marshal data (long size out of range)" );
@@ -845,10 +850,6 @@ r_PyLong(RFILE *p)
845850 d = 0 ;
846851 for (j = 0 ; j < PyLong_MARSHAL_RATIO ; j ++ ) {
847852 md = r_short (p );
848- if (PyErr_Occurred ()) {
849- Py_DECREF (ob );
850- return NULL ;
851- }
852853 if (md < 0 || md > PyLong_MARSHAL_BASE )
853854 goto bad_digit ;
854855 d += (digit )md << j * PyLong_MARSHAL_SHIFT ;
@@ -859,10 +860,6 @@ r_PyLong(RFILE *p)
859860 d = 0 ;
860861 for (j = 0 ; j < shorts_in_top_digit ; j ++ ) {
861862 md = r_short (p );
862- if (PyErr_Occurred ()) {
863- Py_DECREF (ob );
864- return NULL ;
865- }
866863 if (md < 0 || md > PyLong_MARSHAL_BASE )
867864 goto bad_digit ;
868865 /* topmost marshal digit should be nonzero */
@@ -874,18 +871,16 @@ r_PyLong(RFILE *p)
874871 }
875872 d += (digit )md << j * PyLong_MARSHAL_SHIFT ;
876873 }
877- if (PyErr_Occurred ()) {
878- Py_DECREF (ob );
879- return NULL ;
880- }
881874 /* top digit should be nonzero, else the resulting PyLong won't be
882875 normalized */
883876 ob -> ob_digit [size - 1 ] = d ;
884877 return (PyObject * )ob ;
885878 bad_digit :
886879 Py_DECREF (ob );
887- PyErr_SetString (PyExc_ValueError ,
888- "bad marshal data (digit out of range in long)" );
880+ if (!PyErr_Occurred ()) {
881+ PyErr_SetString (PyExc_ValueError ,
882+ "bad marshal data (digit out of range in long)" );
883+ }
889884 return NULL ;
890885}
891886
@@ -908,8 +903,6 @@ r_float_str(RFILE *p)
908903 const char * ptr ;
909904 n = r_byte (p );
910905 if (n == EOF ) {
911- PyErr_SetString (PyExc_EOFError ,
912- "EOF read where object expected" );
913906 return -1 ;
914907 }
915908 ptr = r_string (n , p );
@@ -987,8 +980,10 @@ r_object(RFILE *p)
987980 PyObject * retval = NULL ;
988981
989982 if (code == EOF ) {
990- PyErr_SetString (PyExc_EOFError ,
991- "EOF read where object expected" );
983+ if (PyErr_ExceptionMatches (PyExc_EOFError )) {
984+ PyErr_SetString (PyExc_EOFError ,
985+ "EOF read where object expected" );
986+ }
992987 return NULL ;
993988 }
994989
@@ -1035,7 +1030,9 @@ r_object(RFILE *p)
10351030
10361031 case TYPE_INT :
10371032 n = r_long (p );
1038- retval = PyErr_Occurred () ? NULL : PyLong_FromLong (n );
1033+ if (n == -1 && PyErr_Occurred ())
1034+ break ;
1035+ retval = PyLong_FromLong (n );
10391036 R_REF (retval );
10401037 break ;
10411038
@@ -1101,10 +1098,10 @@ r_object(RFILE *p)
11011098 {
11021099 const char * ptr ;
11031100 n = r_long (p );
1104- if (PyErr_Occurred ())
1105- break ;
11061101 if (n < 0 || n > SIZE32_MAX ) {
1107- PyErr_SetString (PyExc_ValueError , "bad marshal data (bytes object size out of range)" );
1102+ if (!PyErr_Occurred ()) {
1103+ PyErr_SetString (PyExc_ValueError , "bad marshal data (bytes object size out of range)" );
1104+ }
11081105 break ;
11091106 }
11101107 v = PyBytes_FromStringAndSize ((char * )NULL , n );
@@ -1126,10 +1123,10 @@ r_object(RFILE *p)
11261123 /* fall through */
11271124 case TYPE_ASCII :
11281125 n = r_long (p );
1129- if (PyErr_Occurred ())
1130- break ;
11311126 if (n < 0 || n > SIZE32_MAX ) {
1132- PyErr_SetString (PyExc_ValueError , "bad marshal data (string size out of range)" );
1127+ if (!PyErr_Occurred ()) {
1128+ PyErr_SetString (PyExc_ValueError , "bad marshal data (string size out of range)" );
1129+ }
11331130 break ;
11341131 }
11351132 goto _read_ascii ;
@@ -1140,8 +1137,6 @@ r_object(RFILE *p)
11401137 case TYPE_SHORT_ASCII :
11411138 n = r_byte (p );
11421139 if (n == EOF ) {
1143- PyErr_SetString (PyExc_EOFError ,
1144- "EOF read where object expected" );
11451140 break ;
11461141 }
11471142 _read_ascii :
@@ -1168,10 +1163,10 @@ r_object(RFILE *p)
11681163 const char * buffer ;
11691164
11701165 n = r_long (p );
1171- if (PyErr_Occurred ())
1172- break ;
11731166 if (n < 0 || n > SIZE32_MAX ) {
1174- PyErr_SetString (PyExc_ValueError , "bad marshal data (string size out of range)" );
1167+ if (!PyErr_Occurred ()) {
1168+ PyErr_SetString (PyExc_ValueError , "bad marshal data (string size out of range)" );
1169+ }
11751170 break ;
11761171 }
11771172 if (n != 0 ) {
@@ -1193,16 +1188,17 @@ r_object(RFILE *p)
11931188 }
11941189
11951190 case TYPE_SMALL_TUPLE :
1196- n = ( unsigned char ) r_byte (p );
1197- if (PyErr_Occurred ())
1191+ n = r_byte (p );
1192+ if (n == EOF ) {
11981193 break ;
1194+ }
11991195 goto _read_tuple ;
12001196 case TYPE_TUPLE :
12011197 n = r_long (p );
1202- if (PyErr_Occurred ())
1203- break ;
12041198 if (n < 0 || n > SIZE32_MAX ) {
1205- PyErr_SetString (PyExc_ValueError , "bad marshal data (tuple size out of range)" );
1199+ if (!PyErr_Occurred ()) {
1200+ PyErr_SetString (PyExc_ValueError , "bad marshal data (tuple size out of range)" );
1201+ }
12061202 break ;
12071203 }
12081204 _read_tuple :
@@ -1227,10 +1223,10 @@ r_object(RFILE *p)
12271223
12281224 case TYPE_LIST :
12291225 n = r_long (p );
1230- if (PyErr_Occurred ())
1231- break ;
12321226 if (n < 0 || n > SIZE32_MAX ) {
1233- PyErr_SetString (PyExc_ValueError , "bad marshal data (list size out of range)" );
1227+ if (!PyErr_Occurred ()) {
1228+ PyErr_SetString (PyExc_ValueError , "bad marshal data (list size out of range)" );
1229+ }
12341230 break ;
12351231 }
12361232 v = PyList_New (n );
@@ -1283,10 +1279,10 @@ r_object(RFILE *p)
12831279 case TYPE_SET :
12841280 case TYPE_FROZENSET :
12851281 n = r_long (p );
1286- if (PyErr_Occurred ())
1287- break ;
12881282 if (n < 0 || n > SIZE32_MAX ) {
1289- PyErr_SetString (PyExc_ValueError , "bad marshal data (set size out of range)" );
1283+ if (!PyErr_Occurred ()) {
1284+ PyErr_SetString (PyExc_ValueError , "bad marshal data (set size out of range)" );
1285+ }
12901286 break ;
12911287 }
12921288
@@ -1363,20 +1359,20 @@ r_object(RFILE *p)
13631359
13641360 /* XXX ignore long->int overflows for now */
13651361 argcount = (int )r_long (p );
1366- if (PyErr_Occurred ())
1362+ if (argcount == -1 && PyErr_Occurred ())
13671363 goto code_error ;
13681364 posonlyargcount = (int )r_long (p );
1369- if (PyErr_Occurred ()) {
1365+ if (posonlyargcount == -1 && PyErr_Occurred ()) {
13701366 goto code_error ;
13711367 }
13721368 kwonlyargcount = (int )r_long (p );
1373- if (PyErr_Occurred ())
1369+ if (kwonlyargcount == -1 && PyErr_Occurred ())
13741370 goto code_error ;
13751371 stacksize = (int )r_long (p );
1376- if (PyErr_Occurred ())
1372+ if (stacksize == -1 && PyErr_Occurred ())
13771373 goto code_error ;
13781374 flags = (int )r_long (p );
1379- if (PyErr_Occurred ())
1375+ if (flags == -1 && PyErr_Occurred ())
13801376 goto code_error ;
13811377 code = r_object (p );
13821378 if (code == NULL )
@@ -1449,6 +1445,10 @@ r_object(RFILE *p)
14491445 v = r_ref_insert (v , idx , flag , p );
14501446
14511447 code_error :
1448+ if (v == NULL && !PyErr_Occurred ()) {
1449+ PyErr_SetString (PyExc_TypeError ,
1450+ "NULL object in marshal data for code object" );
1451+ }
14521452 Py_XDECREF (code );
14531453 Py_XDECREF (consts );
14541454 Py_XDECREF (names );
@@ -1466,9 +1466,9 @@ r_object(RFILE *p)
14661466 case TYPE_REF :
14671467 n = r_long (p );
14681468 if (n < 0 || n >= PyList_GET_SIZE (p -> refs )) {
1469- if (n == -1 && PyErr_Occurred ())
1470- break ;
1471- PyErr_SetString ( PyExc_ValueError , "bad marshal data (invalid reference)" );
1469+ if (! PyErr_Occurred ()) {
1470+ PyErr_SetString ( PyExc_ValueError , "bad marshal data (invalid reference)" ) ;
1471+ }
14721472 break ;
14731473 }
14741474 v = PyList_GET_ITEM (p -> refs , n );
0 commit comments