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