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