Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1 | |
| 2 | /* Write Python objects to files and read them back. |
| 3 | This is intended for writing and reading compiled Python code only; |
| 4 | a true persistent storage facility would be much harder, since |
| 5 | it would have to take circular links and sharing into account. */ |
| 6 | |
Thomas Wouters | 695934a | 2006-03-01 23:49:13 +0000 | [diff] [blame] | 7 | #define PY_SSIZE_T_CLEAN |
| 8 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 9 | #include "Python.h" |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 10 | #include "longintrepr.h" |
Jeremy Hylton | 3e0055f | 2005-10-20 19:59:25 +0000 | [diff] [blame] | 11 | #include "code.h" |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 12 | #include "marshal.h" |
| 13 | |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 14 | /* High water mark to determine when the marshalled object is dangerously deep |
| 15 | * and risks coring the interpreter. When the object stack gets this deep, |
| 16 | * raise an exception instead of continuing. |
| 17 | */ |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 18 | #define MAX_MARSHAL_STACK_DEPTH 2000 |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 19 | |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 20 | #define TYPE_NULL '0' |
| 21 | #define TYPE_NONE 'N' |
| 22 | #define TYPE_FALSE 'F' |
| 23 | #define TYPE_TRUE 'T' |
| 24 | #define TYPE_STOPITER 'S' |
| 25 | #define TYPE_ELLIPSIS '.' |
| 26 | #define TYPE_INT 'i' |
| 27 | #define TYPE_INT64 'I' |
| 28 | #define TYPE_FLOAT 'f' |
| 29 | #define TYPE_BINARY_FLOAT 'g' |
| 30 | #define TYPE_COMPLEX 'x' |
| 31 | #define TYPE_BINARY_COMPLEX 'y' |
| 32 | #define TYPE_LONG 'l' |
| 33 | #define TYPE_STRING 's' |
| 34 | #define TYPE_INTERNED 't' |
| 35 | #define TYPE_STRINGREF 'R' |
| 36 | #define TYPE_TUPLE '(' |
| 37 | #define TYPE_LIST '[' |
| 38 | #define TYPE_DICT '{' |
| 39 | #define TYPE_CODE 'c' |
| 40 | #define TYPE_UNICODE 'u' |
| 41 | #define TYPE_UNKNOWN '?' |
| 42 | #define TYPE_SET '<' |
| 43 | #define TYPE_FROZENSET '>' |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 44 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 45 | typedef struct { |
| 46 | FILE *fp; |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 47 | int error; |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 48 | int depth; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 49 | /* If fp == NULL, the following are valid: */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 50 | PyObject *str; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 51 | char *ptr; |
| 52 | char *end; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 53 | PyObject *strings; /* dict on marshal, list on unmarshal */ |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 54 | int version; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 55 | } WFILE; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 56 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 57 | #define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \ |
| 58 | else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \ |
| 59 | else w_more(c, p) |
| 60 | |
| 61 | static void |
Fredrik Lundh | 1153438 | 2000-07-23 18:24:06 +0000 | [diff] [blame] | 62 | w_more(int c, WFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 63 | { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 64 | Py_ssize_t size, newsize; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 65 | if (p->str == NULL) |
| 66 | return; /* An error already occurred */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 67 | size = PyString_Size(p->str); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 68 | newsize = size + 1024; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 69 | if (_PyString_Resize(&p->str, newsize) != 0) { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 70 | p->ptr = p->end = NULL; |
| 71 | } |
| 72 | else { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 73 | p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size; |
| 74 | p->end = |
| 75 | PyString_AS_STRING((PyStringObject *)p->str) + newsize; |
Tim Peters | 8315ea5 | 2000-07-23 19:28:35 +0000 | [diff] [blame] | 76 | *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 77 | } |
| 78 | } |
| 79 | |
| 80 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 81 | w_string(char *s, int n, WFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 82 | { |
| 83 | if (p->fp != NULL) { |
| 84 | fwrite(s, 1, n, p->fp); |
| 85 | } |
| 86 | else { |
| 87 | while (--n >= 0) { |
| 88 | w_byte(*s, p); |
| 89 | s++; |
| 90 | } |
| 91 | } |
| 92 | } |
| 93 | |
| 94 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 95 | w_short(int x, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 96 | { |
Thomas Heller | 3e1c18a | 2002-07-30 11:40:57 +0000 | [diff] [blame] | 97 | w_byte((char)( x & 0xff), p); |
| 98 | w_byte((char)((x>> 8) & 0xff), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 99 | } |
| 100 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 101 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 102 | w_long(long x, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 103 | { |
Thomas Heller | 37d5a15 | 2002-07-30 11:44:44 +0000 | [diff] [blame] | 104 | w_byte((char)( x & 0xff), p); |
| 105 | w_byte((char)((x>> 8) & 0xff), p); |
| 106 | w_byte((char)((x>>16) & 0xff), p); |
| 107 | w_byte((char)((x>>24) & 0xff), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 108 | } |
| 109 | |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 110 | #if SIZEOF_LONG > 4 |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 111 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 112 | w_long64(long x, WFILE *p) |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 113 | { |
| 114 | w_long(x, p); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 115 | w_long(x>>32, p); |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 116 | } |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 117 | #endif |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 118 | |
| 119 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 120 | w_object(PyObject *v, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 121 | { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 122 | Py_ssize_t i, n; |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 123 | |
| 124 | p->depth++; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 125 | |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 126 | if (p->depth > MAX_MARSHAL_STACK_DEPTH) { |
| 127 | p->error = 2; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 128 | } |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 129 | else if (v == NULL) { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 130 | w_byte(TYPE_NULL, p); |
Guido van Rossum | 730806d | 1998-04-10 22:27:42 +0000 | [diff] [blame] | 131 | } |
| 132 | else if (v == Py_None) { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 133 | w_byte(TYPE_NONE, p); |
Guido van Rossum | 730806d | 1998-04-10 22:27:42 +0000 | [diff] [blame] | 134 | } |
Tim Peters | 5ca576e | 2001-06-18 22:08:13 +0000 | [diff] [blame] | 135 | else if (v == PyExc_StopIteration) { |
| 136 | w_byte(TYPE_STOPITER, p); |
| 137 | } |
Guido van Rossum | 730806d | 1998-04-10 22:27:42 +0000 | [diff] [blame] | 138 | else if (v == Py_Ellipsis) { |
| 139 | w_byte(TYPE_ELLIPSIS, p); |
| 140 | } |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 141 | else if (v == Py_False) { |
| 142 | w_byte(TYPE_FALSE, p); |
| 143 | } |
| 144 | else if (v == Py_True) { |
| 145 | w_byte(TYPE_TRUE, p); |
| 146 | } |
Guido van Rossum | ddefaf3 | 2007-01-14 03:31:43 +0000 | [diff] [blame] | 147 | else if (PyLong_Check(v)) { |
| 148 | long x = PyLong_AsLong(v); |
| 149 | if ((x == -1) && PyErr_Occurred()) { |
| 150 | PyLongObject *ob = (PyLongObject *)v; |
| 151 | PyErr_Clear(); |
| 152 | w_byte(TYPE_LONG, p); |
Martin v. Löwis | 9f2e346 | 2007-07-21 17:22:18 +0000 | [diff] [blame] | 153 | n = Py_Size(ob); |
Guido van Rossum | ddefaf3 | 2007-01-14 03:31:43 +0000 | [diff] [blame] | 154 | w_long((long)n, p); |
| 155 | if (n < 0) |
| 156 | n = -n; |
| 157 | for (i = 0; i < n; i++) |
| 158 | w_short(ob->ob_digit[i], p); |
| 159 | } |
| 160 | else { |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 161 | #if SIZEOF_LONG > 4 |
Guido van Rossum | ddefaf3 | 2007-01-14 03:31:43 +0000 | [diff] [blame] | 162 | long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31); |
| 163 | if (y && y != -1) { |
| 164 | w_byte(TYPE_INT64, p); |
| 165 | w_long64(x, p); |
| 166 | } |
| 167 | else |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 168 | #endif |
| 169 | { |
Guido van Rossum | ddefaf3 | 2007-01-14 03:31:43 +0000 | [diff] [blame] | 170 | w_byte(TYPE_INT, p); |
| 171 | w_long(x, p); |
| 172 | } |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 173 | } |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 174 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 175 | else if (PyFloat_Check(v)) { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 176 | if (p->version > 1) { |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 177 | unsigned char buf[8]; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 178 | if (_PyFloat_Pack8(PyFloat_AsDouble(v), |
| 179 | buf, 1) < 0) { |
| 180 | p->error = 1; |
| 181 | return; |
| 182 | } |
| 183 | w_byte(TYPE_BINARY_FLOAT, p); |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 184 | w_string((char*)buf, 8, p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 185 | } |
| 186 | else { |
| 187 | char buf[256]; /* Plenty to format any double */ |
Neal Norwitz | 545686b | 2006-12-28 04:45:06 +0000 | [diff] [blame] | 188 | n = _PyFloat_Repr(PyFloat_AS_DOUBLE(v), |
| 189 | buf, sizeof(buf)); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 190 | w_byte(TYPE_FLOAT, p); |
Martin v. Löwis | 67baee6 | 2006-02-16 14:37:48 +0000 | [diff] [blame] | 191 | w_byte((int)n, p); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 192 | w_string(buf, (int)n, p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 193 | } |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 194 | } |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 195 | #ifndef WITHOUT_COMPLEX |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 196 | else if (PyComplex_Check(v)) { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 197 | if (p->version > 1) { |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 198 | unsigned char buf[8]; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 199 | if (_PyFloat_Pack8(PyComplex_RealAsDouble(v), |
| 200 | buf, 1) < 0) { |
| 201 | p->error = 1; |
| 202 | return; |
| 203 | } |
| 204 | w_byte(TYPE_BINARY_COMPLEX, p); |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 205 | w_string((char*)buf, 8, p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 206 | if (_PyFloat_Pack8(PyComplex_ImagAsDouble(v), |
| 207 | buf, 1) < 0) { |
| 208 | p->error = 1; |
| 209 | return; |
| 210 | } |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 211 | w_string((char*)buf, 8, p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 212 | } |
| 213 | else { |
| 214 | char buf[256]; /* Plenty to format any double */ |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 215 | w_byte(TYPE_COMPLEX, p); |
Neal Norwitz | 545686b | 2006-12-28 04:45:06 +0000 | [diff] [blame] | 216 | n = _PyFloat_Repr(PyComplex_RealAsDouble(v), |
| 217 | buf, sizeof(buf)); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 218 | n = strlen(buf); |
| 219 | w_byte((int)n, p); |
| 220 | w_string(buf, (int)n, p); |
Neal Norwitz | 545686b | 2006-12-28 04:45:06 +0000 | [diff] [blame] | 221 | n = _PyFloat_Repr(PyComplex_ImagAsDouble(v), |
| 222 | buf, sizeof(buf)); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 223 | w_byte((int)n, p); |
| 224 | w_string(buf, (int)n, p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 225 | } |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 226 | } |
| 227 | #endif |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 228 | else if (PyString_Check(v)) { |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 229 | if (p->strings && PyString_CHECK_INTERNED(v)) { |
| 230 | PyObject *o = PyDict_GetItem(p->strings, v); |
| 231 | if (o) { |
| 232 | long w = PyInt_AsLong(o); |
| 233 | w_byte(TYPE_STRINGREF, p); |
| 234 | w_long(w, p); |
| 235 | goto exit; |
| 236 | } |
| 237 | else { |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 238 | int ok; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 239 | o = PyInt_FromSsize_t(PyDict_Size(p->strings)); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 240 | ok = o && |
| 241 | PyDict_SetItem(p->strings, v, o) >= 0; |
| 242 | Py_XDECREF(o); |
| 243 | if (!ok) { |
| 244 | p->depth--; |
| 245 | p->error = 1; |
| 246 | return; |
| 247 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 248 | w_byte(TYPE_INTERNED, p); |
| 249 | } |
| 250 | } |
| 251 | else { |
| 252 | w_byte(TYPE_STRING, p); |
| 253 | } |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 254 | n = PyString_GET_SIZE(v); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 255 | if (n > INT_MAX) { |
| 256 | /* huge strings are not supported */ |
| 257 | p->depth--; |
| 258 | p->error = 1; |
| 259 | return; |
| 260 | } |
Guido van Rossum | 3a205f7 | 1995-02-17 15:10:07 +0000 | [diff] [blame] | 261 | w_long((long)n, p); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 262 | w_string(PyString_AS_STRING(v), (int)n, p); |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 263 | } |
| 264 | else if (PyUnicode_Check(v)) { |
| 265 | PyObject *utf8; |
| 266 | utf8 = PyUnicode_AsUTF8String(v); |
| 267 | if (utf8 == NULL) { |
Guido van Rossum | 98626cd | 2000-06-28 23:24:19 +0000 | [diff] [blame] | 268 | p->depth--; |
| 269 | p->error = 1; |
| 270 | return; |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 271 | } |
| 272 | w_byte(TYPE_UNICODE, p); |
Guido van Rossum | f15a29f | 2007-05-04 00:41:39 +0000 | [diff] [blame] | 273 | n = PyBytes_GET_SIZE(utf8); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 274 | if (n > INT_MAX) { |
| 275 | p->depth--; |
| 276 | p->error = 1; |
| 277 | return; |
| 278 | } |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 279 | w_long((long)n, p); |
Guido van Rossum | f15a29f | 2007-05-04 00:41:39 +0000 | [diff] [blame] | 280 | w_string(PyBytes_AS_STRING(utf8), (int)n, p); |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 281 | Py_DECREF(utf8); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 282 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 283 | else if (PyTuple_Check(v)) { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 284 | w_byte(TYPE_TUPLE, p); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 285 | n = PyTuple_Size(v); |
Guido van Rossum | 3a205f7 | 1995-02-17 15:10:07 +0000 | [diff] [blame] | 286 | w_long((long)n, p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 287 | for (i = 0; i < n; i++) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 288 | w_object(PyTuple_GET_ITEM(v, i), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 289 | } |
| 290 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 291 | else if (PyList_Check(v)) { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 292 | w_byte(TYPE_LIST, p); |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 293 | n = PyList_GET_SIZE(v); |
Guido van Rossum | 3a205f7 | 1995-02-17 15:10:07 +0000 | [diff] [blame] | 294 | w_long((long)n, p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 295 | for (i = 0; i < n; i++) { |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 296 | w_object(PyList_GET_ITEM(v, i), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 297 | } |
| 298 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 299 | else if (PyDict_Check(v)) { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 300 | Py_ssize_t pos; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 301 | PyObject *key, *value; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 302 | w_byte(TYPE_DICT, p); |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 303 | /* This one is NULL object terminated! */ |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 304 | pos = 0; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 305 | while (PyDict_Next(v, &pos, &key, &value)) { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 306 | w_object(key, p); |
| 307 | w_object(value, p); |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 308 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 309 | w_object((PyObject *)NULL, p); |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 310 | } |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 311 | else if (PyAnySet_Check(v)) { |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 312 | PyObject *value, *it; |
| 313 | |
| 314 | if (PyObject_TypeCheck(v, &PySet_Type)) |
| 315 | w_byte(TYPE_SET, p); |
| 316 | else |
| 317 | w_byte(TYPE_FROZENSET, p); |
| 318 | n = PyObject_Size(v); |
| 319 | if (n == -1) { |
| 320 | p->depth--; |
| 321 | p->error = 1; |
| 322 | return; |
| 323 | } |
| 324 | w_long((long)n, p); |
| 325 | it = PyObject_GetIter(v); |
| 326 | if (it == NULL) { |
| 327 | p->depth--; |
| 328 | p->error = 1; |
| 329 | return; |
| 330 | } |
| 331 | while ((value = PyIter_Next(it)) != NULL) { |
| 332 | w_object(value, p); |
| 333 | Py_DECREF(value); |
| 334 | } |
| 335 | Py_DECREF(it); |
| 336 | if (PyErr_Occurred()) { |
| 337 | p->depth--; |
| 338 | p->error = 1; |
| 339 | return; |
| 340 | } |
| 341 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 342 | else if (PyCode_Check(v)) { |
| 343 | PyCodeObject *co = (PyCodeObject *)v; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 344 | w_byte(TYPE_CODE, p); |
Neal Norwitz | 7fdcb41 | 2002-06-14 01:07:39 +0000 | [diff] [blame] | 345 | w_long(co->co_argcount, p); |
Guido van Rossum | 4f72a78 | 2006-10-27 23:31:49 +0000 | [diff] [blame] | 346 | w_long(co->co_kwonlyargcount, p); |
Neal Norwitz | 7fdcb41 | 2002-06-14 01:07:39 +0000 | [diff] [blame] | 347 | w_long(co->co_nlocals, p); |
| 348 | w_long(co->co_stacksize, p); |
| 349 | w_long(co->co_flags, p); |
Guido van Rossum | d076c73 | 1998-10-07 19:42:25 +0000 | [diff] [blame] | 350 | w_object(co->co_code, p); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 351 | w_object(co->co_consts, p); |
| 352 | w_object(co->co_names, p); |
Guido van Rossum | 681d79a | 1995-07-18 14:51:37 +0000 | [diff] [blame] | 353 | w_object(co->co_varnames, p); |
Jeremy Hylton | 64949cb | 2001-01-25 20:06:59 +0000 | [diff] [blame] | 354 | w_object(co->co_freevars, p); |
| 355 | w_object(co->co_cellvars, p); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 356 | w_object(co->co_filename, p); |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 357 | w_object(co->co_name, p); |
Neal Norwitz | 7fdcb41 | 2002-06-14 01:07:39 +0000 | [diff] [blame] | 358 | w_long(co->co_firstlineno, p); |
Guido van Rossum | d031c89 | 1997-01-24 03:44:17 +0000 | [diff] [blame] | 359 | w_object(co->co_lnotab, p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 360 | } |
Travis E. Oliphant | b99f762 | 2007-08-18 11:21:56 +0000 | [diff] [blame] | 361 | else if (PyObject_CheckBuffer(v)) { |
Guido van Rossum | d076c73 | 1998-10-07 19:42:25 +0000 | [diff] [blame] | 362 | /* Write unknown buffer-style objects as a string */ |
| 363 | char *s; |
Jeremy Hylton | 9f64caa | 2001-11-09 22:02:48 +0000 | [diff] [blame] | 364 | PyBufferProcs *pb = v->ob_type->tp_as_buffer; |
Travis E. Oliphant | b99f762 | 2007-08-18 11:21:56 +0000 | [diff] [blame] | 365 | PyBuffer view; |
| 366 | if ((*pb->bf_getbuffer)(v, &view, PyBUF_SIMPLE) != 0) { |
| 367 | w_byte(TYPE_UNKNOWN, p); |
| 368 | p->error = 1; |
| 369 | } |
Guido van Rossum | d076c73 | 1998-10-07 19:42:25 +0000 | [diff] [blame] | 370 | w_byte(TYPE_STRING, p); |
Travis E. Oliphant | b99f762 | 2007-08-18 11:21:56 +0000 | [diff] [blame] | 371 | n = view.len; |
| 372 | s = view.buf; |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 373 | if (n > INT_MAX) { |
| 374 | p->depth--; |
| 375 | p->error = 1; |
| 376 | return; |
| 377 | } |
Guido van Rossum | d076c73 | 1998-10-07 19:42:25 +0000 | [diff] [blame] | 378 | w_long((long)n, p); |
Martin v. Löwis | 725507b | 2006-03-07 12:08:51 +0000 | [diff] [blame] | 379 | w_string(s, (int)n, p); |
Travis E. Oliphant | b99f762 | 2007-08-18 11:21:56 +0000 | [diff] [blame] | 380 | if (pb->bf_releasebuffer != NULL) |
| 381 | (*pb->bf_releasebuffer)(v, &view); |
Guido van Rossum | d076c73 | 1998-10-07 19:42:25 +0000 | [diff] [blame] | 382 | } |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 383 | else { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 384 | w_byte(TYPE_UNKNOWN, p); |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 385 | p->error = 1; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 386 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 387 | exit: |
Guido van Rossum | 98626cd | 2000-06-28 23:24:19 +0000 | [diff] [blame] | 388 | p->depth--; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 389 | } |
| 390 | |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 391 | /* version currently has no effect for writing longs. */ |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 392 | void |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 393 | PyMarshal_WriteLongToFile(long x, FILE *fp, int version) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 394 | { |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 395 | WFILE wf; |
| 396 | wf.fp = fp; |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 397 | wf.error = 0; |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 398 | wf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 399 | wf.strings = NULL; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 400 | wf.version = version; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 401 | w_long(x, &wf); |
| 402 | } |
| 403 | |
| 404 | void |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 405 | PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp, int version) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 406 | { |
| 407 | WFILE wf; |
| 408 | wf.fp = fp; |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 409 | wf.error = 0; |
Guido van Rossum | 98626cd | 2000-06-28 23:24:19 +0000 | [diff] [blame] | 410 | wf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 411 | wf.strings = (version > 0) ? PyDict_New() : NULL; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 412 | wf.version = version; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 413 | w_object(x, &wf); |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 414 | Py_XDECREF(wf.strings); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 415 | } |
| 416 | |
| 417 | typedef WFILE RFILE; /* Same struct with different invariants */ |
| 418 | |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 419 | #define rs_byte(p) (((p)->ptr < (p)->end) ? (unsigned char)*(p)->ptr++ : EOF) |
Guido van Rossum | 8d617a6 | 1995-03-09 12:12:11 +0000 | [diff] [blame] | 420 | |
| 421 | #define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p)) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 422 | |
| 423 | static int |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 424 | r_string(char *s, int n, RFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 425 | { |
| 426 | if (p->fp != NULL) |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 427 | /* The result fits into int because it must be <=n. */ |
| 428 | return (int)fread(s, 1, n, p->fp); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 429 | if (p->end - p->ptr < n) |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 430 | n = (int)(p->end - p->ptr); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 431 | memcpy(s, p->ptr, n); |
| 432 | p->ptr += n; |
| 433 | return n; |
| 434 | } |
| 435 | |
| 436 | static int |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 437 | r_short(RFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 438 | { |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 439 | register short x; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 440 | x = r_byte(p); |
| 441 | x |= r_byte(p) << 8; |
Tim Peters | e84b740 | 2000-09-19 08:54:13 +0000 | [diff] [blame] | 442 | /* Sign-extension, in case short greater than 16 bits */ |
| 443 | x |= -(x & 0x8000); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 444 | return x; |
| 445 | } |
| 446 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 447 | static long |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 448 | r_long(RFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 449 | { |
| 450 | register long x; |
Guido van Rossum | 8d617a6 | 1995-03-09 12:12:11 +0000 | [diff] [blame] | 451 | register FILE *fp = p->fp; |
| 452 | if (fp) { |
| 453 | x = getc(fp); |
| 454 | x |= (long)getc(fp) << 8; |
| 455 | x |= (long)getc(fp) << 16; |
| 456 | x |= (long)getc(fp) << 24; |
| 457 | } |
| 458 | else { |
| 459 | x = rs_byte(p); |
| 460 | x |= (long)rs_byte(p) << 8; |
| 461 | x |= (long)rs_byte(p) << 16; |
| 462 | x |= (long)rs_byte(p) << 24; |
| 463 | } |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 464 | #if SIZEOF_LONG > 4 |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 465 | /* Sign extension for 64-bit machines */ |
Tim Peters | e84b740 | 2000-09-19 08:54:13 +0000 | [diff] [blame] | 466 | x |= -(x & 0x80000000L); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 467 | #endif |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 468 | return x; |
| 469 | } |
| 470 | |
Tim Peters | 8211237 | 2001-08-29 02:28:42 +0000 | [diff] [blame] | 471 | /* r_long64 deals with the TYPE_INT64 code. On a machine with |
| 472 | sizeof(long) > 4, it returns a Python int object, else a Python long |
| 473 | object. Note that w_long64 writes out TYPE_INT if 32 bits is enough, |
| 474 | so there's no inefficiency here in returning a PyLong on 32-bit boxes |
| 475 | for everything written via TYPE_INT64 (i.e., if an int is written via |
| 476 | TYPE_INT64, it *needs* more than 32 bits). |
| 477 | */ |
| 478 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 479 | r_long64(RFILE *p) |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 480 | { |
Tim Peters | 8211237 | 2001-08-29 02:28:42 +0000 | [diff] [blame] | 481 | long lo4 = r_long(p); |
| 482 | long hi4 = r_long(p); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 483 | #if SIZEOF_LONG > 4 |
Tim Peters | 8211237 | 2001-08-29 02:28:42 +0000 | [diff] [blame] | 484 | long x = (hi4 << 32) | (lo4 & 0xFFFFFFFFL); |
| 485 | return PyInt_FromLong(x); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 486 | #else |
Tim Peters | 8211237 | 2001-08-29 02:28:42 +0000 | [diff] [blame] | 487 | unsigned char buf[8]; |
| 488 | int one = 1; |
| 489 | int is_little_endian = (int)*(char*)&one; |
| 490 | if (is_little_endian) { |
| 491 | memcpy(buf, &lo4, 4); |
| 492 | memcpy(buf+4, &hi4, 4); |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 493 | } |
Tim Peters | 8211237 | 2001-08-29 02:28:42 +0000 | [diff] [blame] | 494 | else { |
| 495 | memcpy(buf, &hi4, 4); |
| 496 | memcpy(buf+4, &lo4, 4); |
| 497 | } |
| 498 | return _PyLong_FromByteArray(buf, 8, is_little_endian, 1); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 499 | #endif |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 500 | } |
| 501 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 502 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 503 | r_object(RFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 504 | { |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 505 | /* NULL is a valid return value, it does not necessarily means that |
| 506 | an exception is set. */ |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 507 | PyObject *v, *v2, *v3; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 508 | long i, n; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 509 | int type = r_byte(p); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 510 | PyObject *retval; |
| 511 | |
| 512 | p->depth++; |
| 513 | |
| 514 | if (p->depth > MAX_MARSHAL_STACK_DEPTH) { |
| 515 | p->depth--; |
| 516 | PyErr_SetString(PyExc_ValueError, "recursion limit exceeded"); |
| 517 | return NULL; |
| 518 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 519 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 520 | switch (type) { |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 521 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 522 | case EOF: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 523 | PyErr_SetString(PyExc_EOFError, |
| 524 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 525 | retval = NULL; |
| 526 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 527 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 528 | case TYPE_NULL: |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 529 | retval = NULL; |
| 530 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 531 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 532 | case TYPE_NONE: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 533 | Py_INCREF(Py_None); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 534 | retval = Py_None; |
| 535 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 536 | |
Tim Peters | 5ca576e | 2001-06-18 22:08:13 +0000 | [diff] [blame] | 537 | case TYPE_STOPITER: |
| 538 | Py_INCREF(PyExc_StopIteration); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 539 | retval = PyExc_StopIteration; |
| 540 | break; |
Tim Peters | 5ca576e | 2001-06-18 22:08:13 +0000 | [diff] [blame] | 541 | |
Guido van Rossum | e449af7 | 1996-10-11 16:25:41 +0000 | [diff] [blame] | 542 | case TYPE_ELLIPSIS: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 543 | Py_INCREF(Py_Ellipsis); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 544 | retval = Py_Ellipsis; |
| 545 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 546 | |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 547 | case TYPE_FALSE: |
| 548 | Py_INCREF(Py_False); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 549 | retval = Py_False; |
| 550 | break; |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 551 | |
| 552 | case TYPE_TRUE: |
| 553 | Py_INCREF(Py_True); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 554 | retval = Py_True; |
| 555 | break; |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 556 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 557 | case TYPE_INT: |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 558 | retval = PyInt_FromLong(r_long(p)); |
| 559 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 560 | |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 561 | case TYPE_INT64: |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 562 | retval = r_long64(p); |
| 563 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 564 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 565 | case TYPE_LONG: |
| 566 | { |
| 567 | int size; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 568 | PyLongObject *ob; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 569 | n = r_long(p); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 570 | if (n < -INT_MAX || n > INT_MAX) { |
| 571 | PyErr_SetString(PyExc_ValueError, |
| 572 | "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 573 | retval = NULL; |
| 574 | break; |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 575 | } |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 576 | size = n<0 ? -n : n; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 577 | ob = _PyLong_New(size); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 578 | if (ob == NULL) { |
| 579 | retval = NULL; |
| 580 | break; |
| 581 | } |
Martin v. Löwis | 9f2e346 | 2007-07-21 17:22:18 +0000 | [diff] [blame] | 582 | Py_Size(ob) = n; |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 583 | for (i = 0; i < size; i++) { |
| 584 | int digit = r_short(p); |
| 585 | if (digit < 0) { |
| 586 | Py_DECREF(ob); |
| 587 | PyErr_SetString(PyExc_ValueError, |
| 588 | "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 589 | ob = NULL; |
| 590 | break; |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 591 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 592 | if (ob != NULL) |
| 593 | ob->ob_digit[i] = digit; |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 594 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 595 | retval = (PyObject *)ob; |
| 596 | break; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 597 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 598 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 599 | case TYPE_FLOAT: |
| 600 | { |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 601 | char buf[256]; |
Guido van Rossum | 0ae748d | 1997-02-14 22:58:07 +0000 | [diff] [blame] | 602 | double dx; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 603 | n = r_byte(p); |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 604 | if (n == EOF || r_string(buf, (int)n, p) != n) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 605 | PyErr_SetString(PyExc_EOFError, |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 606 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 607 | retval = NULL; |
| 608 | break; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 609 | } |
| 610 | buf[n] = '\0'; |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 611 | retval = NULL; |
| 612 | PyFPE_START_PROTECT("atof", break) |
Martin v. Löwis | 737ea82 | 2004-06-08 18:52:54 +0000 | [diff] [blame] | 613 | dx = PyOS_ascii_atof(buf); |
Guido van Rossum | 45b8391 | 1997-03-14 04:32:50 +0000 | [diff] [blame] | 614 | PyFPE_END_PROTECT(dx) |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 615 | retval = PyFloat_FromDouble(dx); |
| 616 | break; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 617 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 618 | |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 619 | case TYPE_BINARY_FLOAT: |
| 620 | { |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 621 | unsigned char buf[8]; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 622 | double x; |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 623 | if (r_string((char*)buf, 8, p) != 8) { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 624 | PyErr_SetString(PyExc_EOFError, |
| 625 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 626 | retval = NULL; |
| 627 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 628 | } |
| 629 | x = _PyFloat_Unpack8(buf, 1); |
| 630 | if (x == -1.0 && PyErr_Occurred()) { |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 631 | retval = NULL; |
| 632 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 633 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 634 | retval = PyFloat_FromDouble(x); |
| 635 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 636 | } |
| 637 | |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 638 | #ifndef WITHOUT_COMPLEX |
| 639 | case TYPE_COMPLEX: |
| 640 | { |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 641 | char buf[256]; |
Guido van Rossum | 530956d | 1996-07-21 02:27:43 +0000 | [diff] [blame] | 642 | Py_complex c; |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 643 | n = r_byte(p); |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 644 | if (n == EOF || r_string(buf, (int)n, p) != n) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 645 | PyErr_SetString(PyExc_EOFError, |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 646 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 647 | retval = NULL; |
| 648 | break; |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 649 | } |
| 650 | buf[n] = '\0'; |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 651 | retval = NULL; |
| 652 | PyFPE_START_PROTECT("atof", break;) |
Martin v. Löwis | 737ea82 | 2004-06-08 18:52:54 +0000 | [diff] [blame] | 653 | c.real = PyOS_ascii_atof(buf); |
Guido van Rossum | 45b8391 | 1997-03-14 04:32:50 +0000 | [diff] [blame] | 654 | PyFPE_END_PROTECT(c) |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 655 | n = r_byte(p); |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 656 | if (n == EOF || r_string(buf, (int)n, p) != n) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 657 | PyErr_SetString(PyExc_EOFError, |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 658 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 659 | retval = NULL; |
| 660 | break; |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 661 | } |
| 662 | buf[n] = '\0'; |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 663 | PyFPE_START_PROTECT("atof", break) |
Martin v. Löwis | 737ea82 | 2004-06-08 18:52:54 +0000 | [diff] [blame] | 664 | c.imag = PyOS_ascii_atof(buf); |
Guido van Rossum | 45b8391 | 1997-03-14 04:32:50 +0000 | [diff] [blame] | 665 | PyFPE_END_PROTECT(c) |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 666 | retval = PyComplex_FromCComplex(c); |
| 667 | break; |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 668 | } |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 669 | |
| 670 | case TYPE_BINARY_COMPLEX: |
| 671 | { |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 672 | unsigned char buf[8]; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 673 | Py_complex c; |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 674 | if (r_string((char*)buf, 8, p) != 8) { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 675 | PyErr_SetString(PyExc_EOFError, |
| 676 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 677 | retval = NULL; |
| 678 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 679 | } |
| 680 | c.real = _PyFloat_Unpack8(buf, 1); |
| 681 | if (c.real == -1.0 && PyErr_Occurred()) { |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 682 | retval = NULL; |
| 683 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 684 | } |
Brett Cannon | c9371d4 | 2005-06-25 08:23:41 +0000 | [diff] [blame] | 685 | if (r_string((char*)buf, 8, p) != 8) { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 686 | PyErr_SetString(PyExc_EOFError, |
| 687 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 688 | retval = NULL; |
| 689 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 690 | } |
| 691 | c.imag = _PyFloat_Unpack8(buf, 1); |
| 692 | if (c.imag == -1.0 && PyErr_Occurred()) { |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 693 | retval = NULL; |
| 694 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 695 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 696 | retval = PyComplex_FromCComplex(c); |
| 697 | break; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 698 | } |
Guido van Rossum | 8a5c5d2 | 1996-01-12 01:09:56 +0000 | [diff] [blame] | 699 | #endif |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 700 | |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 701 | case TYPE_INTERNED: |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 702 | case TYPE_STRING: |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 703 | n = r_long(p); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 704 | if (n < 0 || n > INT_MAX) { |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 705 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 706 | retval = NULL; |
| 707 | break; |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 708 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 709 | v = PyString_FromStringAndSize((char *)NULL, n); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 710 | if (v == NULL) { |
| 711 | retval = NULL; |
| 712 | break; |
| 713 | } |
Michael W. Hudson | 6d6917b | 2005-06-03 15:17:16 +0000 | [diff] [blame] | 714 | if (r_string(PyString_AS_STRING(v), (int)n, p) != n) { |
| 715 | Py_DECREF(v); |
| 716 | PyErr_SetString(PyExc_EOFError, |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 717 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 718 | retval = NULL; |
| 719 | break; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 720 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 721 | if (type == TYPE_INTERNED) { |
| 722 | PyString_InternInPlace(&v); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 723 | if (PyList_Append(p->strings, v) < 0) { |
| 724 | retval = NULL; |
| 725 | break; |
| 726 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 727 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 728 | retval = v; |
| 729 | break; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 730 | |
| 731 | case TYPE_STRINGREF: |
| 732 | n = r_long(p); |
Michael W. Hudson | f2ca5af | 2005-06-13 18:28:46 +0000 | [diff] [blame] | 733 | if (n < 0 || n >= PyList_GET_SIZE(p->strings)) { |
| 734 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 735 | retval = NULL; |
| 736 | break; |
Michael W. Hudson | f2ca5af | 2005-06-13 18:28:46 +0000 | [diff] [blame] | 737 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 738 | v = PyList_GET_ITEM(p->strings, n); |
| 739 | Py_INCREF(v); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 740 | retval = v; |
| 741 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 742 | |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 743 | case TYPE_UNICODE: |
| 744 | { |
| 745 | char *buffer; |
| 746 | |
| 747 | n = r_long(p); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 748 | if (n < 0 || n > INT_MAX) { |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 749 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 750 | retval = NULL; |
| 751 | break; |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 752 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 753 | buffer = PyMem_NEW(char, n); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 754 | if (buffer == NULL) { |
| 755 | retval = PyErr_NoMemory(); |
| 756 | break; |
| 757 | } |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 758 | if (r_string(buffer, (int)n, p) != n) { |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 759 | PyMem_DEL(buffer); |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 760 | PyErr_SetString(PyExc_EOFError, |
| 761 | "EOF read where object expected"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 762 | retval = NULL; |
| 763 | break; |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 764 | } |
| 765 | v = PyUnicode_DecodeUTF8(buffer, n, NULL); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 766 | PyMem_DEL(buffer); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 767 | retval = v; |
| 768 | break; |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 769 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 770 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 771 | case TYPE_TUPLE: |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 772 | n = r_long(p); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 773 | if (n < 0 || n > INT_MAX) { |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 774 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 775 | retval = NULL; |
| 776 | break; |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 777 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 778 | v = PyTuple_New((int)n); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 779 | if (v == NULL) { |
| 780 | retval = NULL; |
| 781 | break; |
| 782 | } |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 783 | for (i = 0; i < n; i++) { |
| 784 | v2 = r_object(p); |
| 785 | if ( v2 == NULL ) { |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 786 | if (!PyErr_Occurred()) |
| 787 | PyErr_SetString(PyExc_TypeError, |
| 788 | "NULL object in marshal data"); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 789 | Py_DECREF(v); |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 790 | v = NULL; |
| 791 | break; |
| 792 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 793 | PyTuple_SET_ITEM(v, (int)i, v2); |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 794 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 795 | retval = v; |
| 796 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 797 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 798 | case TYPE_LIST: |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 799 | n = r_long(p); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 800 | if (n < 0 || n > INT_MAX) { |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 801 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 802 | retval = NULL; |
| 803 | break; |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 804 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 805 | v = PyList_New((int)n); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 806 | if (v == NULL) { |
| 807 | retval = NULL; |
| 808 | break; |
| 809 | } |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 810 | for (i = 0; i < n; i++) { |
| 811 | v2 = r_object(p); |
| 812 | if ( v2 == NULL ) { |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 813 | if (!PyErr_Occurred()) |
| 814 | PyErr_SetString(PyExc_TypeError, |
| 815 | "NULL object in marshal data"); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 816 | Py_DECREF(v); |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 817 | v = NULL; |
| 818 | break; |
| 819 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 820 | PyList_SET_ITEM(v, (int)i, v2); |
Jack Jansen | 9513f2c | 1995-10-27 13:21:28 +0000 | [diff] [blame] | 821 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 822 | retval = v; |
| 823 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 824 | |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 825 | case TYPE_DICT: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 826 | v = PyDict_New(); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 827 | if (v == NULL) { |
| 828 | retval = NULL; |
| 829 | break; |
| 830 | } |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 831 | for (;;) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 832 | PyObject *key, *val; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 833 | key = r_object(p); |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 834 | if (key == NULL) |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 835 | break; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 836 | val = r_object(p); |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 837 | if (val != NULL) |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 838 | PyDict_SetItem(v, key, val); |
| 839 | Py_DECREF(key); |
| 840 | Py_XDECREF(val); |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 841 | } |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 842 | if (PyErr_Occurred()) { |
| 843 | Py_DECREF(v); |
| 844 | v = NULL; |
| 845 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 846 | retval = v; |
| 847 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 848 | |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 849 | case TYPE_SET: |
| 850 | case TYPE_FROZENSET: |
| 851 | n = r_long(p); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 852 | if (n < 0 || n > INT_MAX) { |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 853 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 854 | retval = NULL; |
| 855 | break; |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 856 | } |
| 857 | v = PyTuple_New((int)n); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 858 | if (v == NULL) { |
| 859 | retval = NULL; |
| 860 | break; |
| 861 | } |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 862 | for (i = 0; i < n; i++) { |
| 863 | v2 = r_object(p); |
| 864 | if ( v2 == NULL ) { |
| 865 | if (!PyErr_Occurred()) |
| 866 | PyErr_SetString(PyExc_TypeError, |
| 867 | "NULL object in marshal data"); |
| 868 | Py_DECREF(v); |
| 869 | v = NULL; |
| 870 | break; |
| 871 | } |
| 872 | PyTuple_SET_ITEM(v, (int)i, v2); |
| 873 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 874 | if (v == NULL) { |
| 875 | retval = NULL; |
| 876 | break; |
| 877 | } |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 878 | if (type == TYPE_SET) |
Raymond Hettinger | beb3101 | 2005-08-16 03:47:52 +0000 | [diff] [blame] | 879 | v3 = PySet_New(v); |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 880 | else |
Raymond Hettinger | beb3101 | 2005-08-16 03:47:52 +0000 | [diff] [blame] | 881 | v3 = PyFrozenSet_New(v); |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 882 | Py_DECREF(v); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 883 | retval = v3; |
| 884 | break; |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 885 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 886 | case TYPE_CODE: |
Guido van Rossum | a8add0e | 2007-05-14 22:03:55 +0000 | [diff] [blame] | 887 | { |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 888 | int argcount; |
Guido van Rossum | 4f72a78 | 2006-10-27 23:31:49 +0000 | [diff] [blame] | 889 | int kwonlyargcount; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 890 | int nlocals; |
| 891 | int stacksize; |
| 892 | int flags; |
| 893 | PyObject *code = NULL; |
| 894 | PyObject *consts = NULL; |
| 895 | PyObject *names = NULL; |
| 896 | PyObject *varnames = NULL; |
| 897 | PyObject *freevars = NULL; |
| 898 | PyObject *cellvars = NULL; |
| 899 | PyObject *filename = NULL; |
| 900 | PyObject *name = NULL; |
| 901 | int firstlineno; |
| 902 | PyObject *lnotab = NULL; |
| 903 | |
| 904 | v = NULL; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 905 | |
Guido van Rossum | a8add0e | 2007-05-14 22:03:55 +0000 | [diff] [blame] | 906 | /* XXX ignore long->int overflows for now */ |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 907 | argcount = (int)r_long(p); |
| 908 | kwonlyargcount = (int)r_long(p); |
| 909 | nlocals = (int)r_long(p); |
| 910 | stacksize = (int)r_long(p); |
| 911 | flags = (int)r_long(p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 912 | code = r_object(p); |
| 913 | if (code == NULL) |
| 914 | goto code_error; |
| 915 | consts = r_object(p); |
| 916 | if (consts == NULL) |
| 917 | goto code_error; |
| 918 | names = r_object(p); |
| 919 | if (names == NULL) |
| 920 | goto code_error; |
| 921 | varnames = r_object(p); |
| 922 | if (varnames == NULL) |
| 923 | goto code_error; |
| 924 | freevars = r_object(p); |
| 925 | if (freevars == NULL) |
| 926 | goto code_error; |
| 927 | cellvars = r_object(p); |
| 928 | if (cellvars == NULL) |
| 929 | goto code_error; |
| 930 | filename = r_object(p); |
| 931 | if (filename == NULL) |
| 932 | goto code_error; |
| 933 | name = r_object(p); |
| 934 | if (name == NULL) |
| 935 | goto code_error; |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 936 | firstlineno = (int)r_long(p); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 937 | lnotab = r_object(p); |
| 938 | if (lnotab == NULL) |
| 939 | goto code_error; |
| 940 | |
| 941 | v = (PyObject *) PyCode_New( |
Guido van Rossum | 4f72a78 | 2006-10-27 23:31:49 +0000 | [diff] [blame] | 942 | argcount, kwonlyargcount, |
| 943 | nlocals, stacksize, flags, |
Guido van Rossum | 681d79a | 1995-07-18 14:51:37 +0000 | [diff] [blame] | 944 | code, consts, names, varnames, |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 945 | freevars, cellvars, filename, name, |
| 946 | firstlineno, lnotab); |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 947 | |
| 948 | code_error: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 949 | Py_XDECREF(code); |
| 950 | Py_XDECREF(consts); |
| 951 | Py_XDECREF(names); |
| 952 | Py_XDECREF(varnames); |
Jeremy Hylton | 64949cb | 2001-01-25 20:06:59 +0000 | [diff] [blame] | 953 | Py_XDECREF(freevars); |
| 954 | Py_XDECREF(cellvars); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 955 | Py_XDECREF(filename); |
| 956 | Py_XDECREF(name); |
Guido van Rossum | 6fc06e7 | 1997-07-26 23:30:18 +0000 | [diff] [blame] | 957 | Py_XDECREF(lnotab); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 958 | |
Guido van Rossum | a8add0e | 2007-05-14 22:03:55 +0000 | [diff] [blame] | 959 | return v; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 960 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 961 | retval = v; |
| 962 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 963 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 964 | default: |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 965 | /* Bogus data got written, which isn't ideal. |
| 966 | This will let you keep working and recover. */ |
Guido van Rossum | a45cb45 | 1998-06-08 20:27:29 +0000 | [diff] [blame] | 967 | PyErr_SetString(PyExc_ValueError, "bad marshal data"); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 968 | retval = NULL; |
| 969 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 970 | |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 971 | } |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 972 | p->depth--; |
| 973 | return retval; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 974 | } |
| 975 | |
Neal Norwitz | d85c452 | 2004-06-13 20:31:49 +0000 | [diff] [blame] | 976 | static PyObject * |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 977 | read_object(RFILE *p) |
| 978 | { |
| 979 | PyObject *v; |
| 980 | if (PyErr_Occurred()) { |
| 981 | fprintf(stderr, "XXX readobject called with exception set\n"); |
| 982 | return NULL; |
| 983 | } |
| 984 | v = r_object(p); |
| 985 | if (v == NULL && !PyErr_Occurred()) |
| 986 | PyErr_SetString(PyExc_TypeError, "NULL object in marshal data"); |
| 987 | return v; |
| 988 | } |
| 989 | |
Guido van Rossum | b8cf3e6 | 2001-10-19 01:46:21 +0000 | [diff] [blame] | 990 | int |
| 991 | PyMarshal_ReadShortFromFile(FILE *fp) |
| 992 | { |
| 993 | RFILE rf; |
Thomas Wouters | 7f401ef | 2006-03-01 22:30:47 +0000 | [diff] [blame] | 994 | assert(fp); |
Guido van Rossum | b8cf3e6 | 2001-10-19 01:46:21 +0000 | [diff] [blame] | 995 | rf.fp = fp; |
Thomas Wouters | 7464b43 | 2006-03-01 22:34:09 +0000 | [diff] [blame] | 996 | rf.strings = NULL; |
| 997 | rf.end = rf.ptr = NULL; |
Guido van Rossum | b8cf3e6 | 2001-10-19 01:46:21 +0000 | [diff] [blame] | 998 | return r_short(&rf); |
| 999 | } |
| 1000 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1001 | long |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1002 | PyMarshal_ReadLongFromFile(FILE *fp) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1003 | { |
| 1004 | RFILE rf; |
| 1005 | rf.fp = fp; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1006 | rf.strings = NULL; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1007 | return r_long(&rf); |
| 1008 | } |
| 1009 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1010 | #ifdef HAVE_FSTAT |
| 1011 | /* Return size of file in bytes; < 0 if unknown. */ |
| 1012 | static off_t |
| 1013 | getfilesize(FILE *fp) |
| 1014 | { |
| 1015 | struct stat st; |
| 1016 | if (fstat(fileno(fp), &st) != 0) |
| 1017 | return -1; |
| 1018 | else |
| 1019 | return st.st_size; |
| 1020 | } |
| 1021 | #endif |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1022 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1023 | /* If we can get the size of the file up-front, and it's reasonably small, |
| 1024 | * read it in one gulp and delegate to ...FromString() instead. Much quicker |
| 1025 | * than reading a byte at a time from file; speeds .pyc imports. |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1026 | * CAUTION: since this may read the entire remainder of the file, don't |
| 1027 | * call it unless you know you're done with the file. |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1028 | */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1029 | PyObject * |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1030 | PyMarshal_ReadLastObjectFromFile(FILE *fp) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1031 | { |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1032 | /* 75% of 2.1's .pyc files can exploit SMALL_FILE_LIMIT. |
| 1033 | * REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. |
| 1034 | */ |
| 1035 | #define SMALL_FILE_LIMIT (1L << 14) |
| 1036 | #define REASONABLE_FILE_LIMIT (1L << 18) |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1037 | #ifdef HAVE_FSTAT |
| 1038 | off_t filesize; |
| 1039 | #endif |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1040 | #ifdef HAVE_FSTAT |
| 1041 | filesize = getfilesize(fp); |
| 1042 | if (filesize > 0) { |
| 1043 | char buf[SMALL_FILE_LIMIT]; |
| 1044 | char* pBuf = NULL; |
| 1045 | if (filesize <= SMALL_FILE_LIMIT) |
| 1046 | pBuf = buf; |
| 1047 | else if (filesize <= REASONABLE_FILE_LIMIT) |
| 1048 | pBuf = (char *)PyMem_MALLOC(filesize); |
| 1049 | if (pBuf != NULL) { |
| 1050 | PyObject* v; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1051 | size_t n; |
| 1052 | /* filesize must fit into an int, because it |
| 1053 | is smaller than REASONABLE_FILE_LIMIT */ |
| 1054 | n = fread(pBuf, 1, (int)filesize, fp); |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1055 | v = PyMarshal_ReadObjectFromString(pBuf, n); |
| 1056 | if (pBuf != buf) |
| 1057 | PyMem_FREE(pBuf); |
| 1058 | return v; |
| 1059 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1060 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1061 | } |
| 1062 | #endif |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1063 | /* We don't have fstat, or we do but the file is larger than |
| 1064 | * REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time. |
| 1065 | */ |
| 1066 | return PyMarshal_ReadObjectFromFile(fp); |
| 1067 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1068 | #undef SMALL_FILE_LIMIT |
| 1069 | #undef REASONABLE_FILE_LIMIT |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1070 | } |
| 1071 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1072 | PyObject * |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1073 | PyMarshal_ReadObjectFromFile(FILE *fp) |
| 1074 | { |
| 1075 | RFILE rf; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1076 | PyObject *result; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1077 | rf.fp = fp; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1078 | rf.strings = PyList_New(0); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 1079 | rf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1080 | result = r_object(&rf); |
| 1081 | Py_DECREF(rf.strings); |
| 1082 | return result; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1083 | } |
| 1084 | |
| 1085 | PyObject * |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1086 | PyMarshal_ReadObjectFromString(char *str, Py_ssize_t len) |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1087 | { |
| 1088 | RFILE rf; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1089 | PyObject *result; |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1090 | rf.fp = NULL; |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1091 | rf.ptr = str; |
| 1092 | rf.end = str + len; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1093 | rf.strings = PyList_New(0); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 1094 | rf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1095 | result = r_object(&rf); |
| 1096 | Py_DECREF(rf.strings); |
| 1097 | return result; |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1098 | } |
| 1099 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1100 | PyObject * |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1101 | PyMarshal_WriteObjectToString(PyObject *x, int version) |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1102 | { |
| 1103 | WFILE wf; |
Guido van Rossum | e6d3904 | 2007-05-09 00:01:30 +0000 | [diff] [blame] | 1104 | PyObject *res = NULL; |
| 1105 | |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1106 | wf.fp = NULL; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1107 | wf.str = PyString_FromStringAndSize((char *)NULL, 50); |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1108 | if (wf.str == NULL) |
| 1109 | return NULL; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1110 | wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str); |
| 1111 | wf.end = wf.ptr + PyString_Size(wf.str); |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1112 | wf.error = 0; |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 1113 | wf.depth = 0; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 1114 | wf.version = version; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1115 | wf.strings = (version > 0) ? PyDict_New() : NULL; |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1116 | w_object(x, &wf); |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1117 | Py_XDECREF(wf.strings); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 1118 | if (wf.str != NULL) { |
| 1119 | char *base = PyString_AS_STRING((PyStringObject *)wf.str); |
| 1120 | if (wf.ptr - base > PY_SSIZE_T_MAX) { |
| 1121 | Py_DECREF(wf.str); |
| 1122 | PyErr_SetString(PyExc_OverflowError, |
Guido van Rossum | f15a29f | 2007-05-04 00:41:39 +0000 | [diff] [blame] | 1123 | "too much marshal data for a string"); |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 1124 | return NULL; |
| 1125 | } |
Guido van Rossum | e6d3904 | 2007-05-09 00:01:30 +0000 | [diff] [blame] | 1126 | if (_PyString_Resize(&wf.str, (Py_ssize_t)(wf.ptr - base)) < 0) |
| 1127 | return NULL; |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 1128 | } |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1129 | if (wf.error) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1130 | Py_XDECREF(wf.str); |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1131 | PyErr_SetString(PyExc_ValueError, |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 1132 | (wf.error==1)?"unmarshallable object" |
| 1133 | :"object too deeply nested to marshal"); |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1134 | return NULL; |
| 1135 | } |
Guido van Rossum | e6d3904 | 2007-05-09 00:01:30 +0000 | [diff] [blame] | 1136 | if (wf.str != NULL) { |
| 1137 | /* XXX Quick hack -- need to do this differently */ |
| 1138 | res = PyBytes_FromObject(wf.str); |
| 1139 | Py_DECREF(wf.str); |
| 1140 | } |
| 1141 | return res; |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1142 | } |
| 1143 | |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 1144 | /* And an interface for Python programs... */ |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1145 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1146 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1147 | marshal_dump(PyObject *self, PyObject *args) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1148 | { |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1149 | /* XXX Quick hack -- need to do this differently */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1150 | PyObject *x; |
| 1151 | PyObject *f; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1152 | int version = Py_MARSHAL_VERSION; |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1153 | PyObject *s; |
| 1154 | PyObject *res; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1155 | if (!PyArg_ParseTuple(args, "OO|i:dump", &x, &f, &version)) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1156 | return NULL; |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1157 | s = PyMarshal_WriteObjectToString(x, version); |
| 1158 | if (s == NULL) |
Guido van Rossum | f215060 | 1996-06-26 20:41:23 +0000 | [diff] [blame] | 1159 | return NULL; |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1160 | res = PyObject_CallMethod(f, "write", "O", s); |
| 1161 | Py_DECREF(s); |
| 1162 | return res; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1163 | } |
| 1164 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1165 | static PyObject * |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1166 | marshal_load(PyObject *self, PyObject *f) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1167 | { |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1168 | /* XXX Quick hack -- need to do this differently */ |
| 1169 | PyObject *data, *result; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1170 | RFILE rf; |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1171 | data = PyObject_CallMethod(f, "read", ""); |
| 1172 | if (data == NULL) |
| 1173 | return NULL; |
| 1174 | rf.fp = NULL; |
| 1175 | if (PyString_Check(data)) { |
| 1176 | rf.ptr = PyString_AS_STRING(data); |
| 1177 | rf.end = rf.ptr + PyString_GET_SIZE(data); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1178 | } |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1179 | else if (PyBytes_Check(data)) { |
| 1180 | rf.ptr = PyBytes_AS_STRING(data); |
| 1181 | rf.end = rf.ptr + PyBytes_GET_SIZE(data); |
| 1182 | } |
| 1183 | else { |
| 1184 | PyErr_Format(PyExc_TypeError, |
| 1185 | "f.read() returned neither string " |
| 1186 | "nor bytes but %.100s", |
| 1187 | data->ob_type->tp_name); |
| 1188 | Py_DECREF(data); |
| 1189 | return NULL; |
| 1190 | } |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1191 | rf.strings = PyList_New(0); |
Guido van Rossum | 7a26534 | 2007-07-30 00:04:35 +0000 | [diff] [blame] | 1192 | rf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1193 | result = read_object(&rf); |
| 1194 | Py_DECREF(rf.strings); |
Guido van Rossum | da5b8f2 | 2007-06-12 23:30:11 +0000 | [diff] [blame] | 1195 | Py_DECREF(data); |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1196 | return result; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1197 | } |
| 1198 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1199 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1200 | marshal_dumps(PyObject *self, PyObject *args) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1201 | { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1202 | PyObject *x; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1203 | int version = Py_MARSHAL_VERSION; |
Armin Rigo | 2ccea17 | 2004-12-20 12:25:57 +0000 | [diff] [blame] | 1204 | if (!PyArg_ParseTuple(args, "O|i:dumps", &x, &version)) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1205 | return NULL; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1206 | return PyMarshal_WriteObjectToString(x, version); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1207 | } |
| 1208 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1209 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1210 | marshal_loads(PyObject *self, PyObject *args) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1211 | { |
| 1212 | RFILE rf; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1213 | char *s; |
Thomas Wouters | 695934a | 2006-03-01 23:49:13 +0000 | [diff] [blame] | 1214 | Py_ssize_t n; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1215 | PyObject* result; |
Michael W. Hudson | 01fca11 | 2005-06-13 17:50:18 +0000 | [diff] [blame] | 1216 | if (!PyArg_ParseTuple(args, "s#:loads", &s, &n)) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1217 | return NULL; |
| 1218 | rf.fp = NULL; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1219 | rf.ptr = s; |
| 1220 | rf.end = s + n; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1221 | rf.strings = PyList_New(0); |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 1222 | rf.depth = 0; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1223 | result = read_object(&rf); |
| 1224 | Py_DECREF(rf.strings); |
| 1225 | return result; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1226 | } |
| 1227 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1228 | static PyMethodDef marshal_methods[] = { |
Neal Norwitz | 031829d | 2002-03-31 14:37:44 +0000 | [diff] [blame] | 1229 | {"dump", marshal_dump, METH_VARARGS}, |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1230 | {"load", marshal_load, METH_O}, |
Neal Norwitz | 031829d | 2002-03-31 14:37:44 +0000 | [diff] [blame] | 1231 | {"dumps", marshal_dumps, METH_VARARGS}, |
| 1232 | {"loads", marshal_loads, METH_VARARGS}, |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1233 | {NULL, NULL} /* sentinel */ |
| 1234 | }; |
| 1235 | |
Jason Tishler | 6bc06ec | 2003-09-04 11:59:50 +0000 | [diff] [blame] | 1236 | PyMODINIT_FUNC |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1237 | PyMarshal_Init(void) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1238 | { |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1239 | PyObject *mod = Py_InitModule("marshal", marshal_methods); |
Neal Norwitz | 1ac754f | 2006-01-19 06:09:39 +0000 | [diff] [blame] | 1240 | if (mod == NULL) |
| 1241 | return; |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1242 | PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1243 | } |