Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1 | |
| 2 | /* Write Python objects to files and read them back. |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 3 | This is primarily intended for writing and reading compiled Python code, |
| 4 | even though dicts, lists, sets and frozensets, not commonly seen in |
| 5 | code objects, are supported. |
| 6 | Version 3 of this protocol properly supports circular links |
| 7 | and sharing. */ |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 8 | |
Thomas Wouters | 695934a | 2006-03-01 23:49:13 +0000 | [diff] [blame] | 9 | #define PY_SSIZE_T_CLEAN |
| 10 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 11 | #include "Python.h" |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 12 | #include "longintrepr.h" |
Jeremy Hylton | 3e0055f | 2005-10-20 19:59:25 +0000 | [diff] [blame] | 13 | #include "code.h" |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 14 | #include "marshal.h" |
| 15 | |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 16 | #define ABS(x) ((x) < 0 ? -(x) : (x)) |
| 17 | |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 18 | /* High water mark to determine when the marshalled object is dangerously deep |
| 19 | * and risks coring the interpreter. When the object stack gets this deep, |
| 20 | * raise an exception instead of continuing. |
Guido van Rossum | 63175a1 | 2007-08-29 20:39:13 +0000 | [diff] [blame] | 21 | * On Windows debug builds, reduce this value. |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 22 | */ |
Guido van Rossum | 63175a1 | 2007-08-29 20:39:13 +0000 | [diff] [blame] | 23 | #if defined(MS_WINDOWS) && defined(_DEBUG) |
| 24 | #define MAX_MARSHAL_STACK_DEPTH 1500 |
| 25 | #else |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 26 | #define MAX_MARSHAL_STACK_DEPTH 2000 |
Guido van Rossum | 63175a1 | 2007-08-29 20:39:13 +0000 | [diff] [blame] | 27 | #endif |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 28 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 29 | #define TYPE_NULL '0' |
| 30 | #define TYPE_NONE 'N' |
| 31 | #define TYPE_FALSE 'F' |
| 32 | #define TYPE_TRUE 'T' |
| 33 | #define TYPE_STOPITER 'S' |
| 34 | #define TYPE_ELLIPSIS '.' |
| 35 | #define TYPE_INT 'i' |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 36 | #define TYPE_FLOAT 'f' |
| 37 | #define TYPE_BINARY_FLOAT 'g' |
| 38 | #define TYPE_COMPLEX 'x' |
| 39 | #define TYPE_BINARY_COMPLEX 'y' |
| 40 | #define TYPE_LONG 'l' |
| 41 | #define TYPE_STRING 's' |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 42 | #define TYPE_INTERNED 't' |
| 43 | #define TYPE_REF 'r' |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 44 | #define TYPE_TUPLE '(' |
| 45 | #define TYPE_LIST '[' |
| 46 | #define TYPE_DICT '{' |
| 47 | #define TYPE_CODE 'c' |
| 48 | #define TYPE_UNICODE 'u' |
| 49 | #define TYPE_UNKNOWN '?' |
| 50 | #define TYPE_SET '<' |
| 51 | #define TYPE_FROZENSET '>' |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 52 | #define FLAG_REF '\x80' /* with a type, add obj to index */ |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 53 | |
Eric Smith | b1a03cf | 2009-04-21 11:57:38 +0000 | [diff] [blame] | 54 | #define WFERR_OK 0 |
| 55 | #define WFERR_UNMARSHALLABLE 1 |
| 56 | #define WFERR_NESTEDTOODEEP 2 |
| 57 | #define WFERR_NOMEMORY 3 |
| 58 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 59 | typedef struct { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 60 | FILE *fp; |
| 61 | int error; /* see WFERR_* values */ |
| 62 | int depth; |
| 63 | /* If fp == NULL, the following are valid: */ |
Éric Araujo | 6c0ba44 | 2011-07-26 17:23:57 +0200 | [diff] [blame] | 64 | PyObject *readable; /* Stream-like object being read from */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 65 | PyObject *str; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 66 | PyObject *current_filename; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 67 | char *ptr; |
| 68 | char *end; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 69 | PyObject *refs; /* dict on marshal, list on unmarshal */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 70 | int version; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 71 | } WFILE; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 72 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 73 | #define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 74 | else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \ |
| 75 | else w_more(c, p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 76 | |
| 77 | static void |
Fredrik Lundh | 1153438 | 2000-07-23 18:24:06 +0000 | [diff] [blame] | 78 | w_more(int c, WFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 79 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 80 | Py_ssize_t size, newsize; |
| 81 | if (p->str == NULL) |
| 82 | return; /* An error already occurred */ |
| 83 | size = PyBytes_Size(p->str); |
| 84 | newsize = size + size + 1024; |
| 85 | if (newsize > 32*1024*1024) { |
| 86 | newsize = size + (size >> 3); /* 12.5% overallocation */ |
| 87 | } |
| 88 | if (_PyBytes_Resize(&p->str, newsize) != 0) { |
| 89 | p->ptr = p->end = NULL; |
| 90 | } |
| 91 | else { |
| 92 | p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size; |
| 93 | p->end = |
| 94 | PyBytes_AS_STRING((PyBytesObject *)p->str) + newsize; |
| 95 | *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char); |
| 96 | } |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 97 | } |
| 98 | |
| 99 | static void |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 100 | w_string(char *s, Py_ssize_t n, WFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 101 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 102 | if (p->fp != NULL) { |
| 103 | fwrite(s, 1, n, p->fp); |
| 104 | } |
| 105 | else { |
| 106 | while (--n >= 0) { |
| 107 | w_byte(*s, p); |
| 108 | s++; |
| 109 | } |
| 110 | } |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 111 | } |
| 112 | |
| 113 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 114 | w_short(int x, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 115 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 116 | w_byte((char)( x & 0xff), p); |
| 117 | w_byte((char)((x>> 8) & 0xff), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 118 | } |
| 119 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 120 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 121 | w_long(long x, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 122 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 123 | w_byte((char)( x & 0xff), p); |
| 124 | w_byte((char)((x>> 8) & 0xff), p); |
| 125 | w_byte((char)((x>>16) & 0xff), p); |
| 126 | w_byte((char)((x>>24) & 0xff), p); |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 127 | } |
| 128 | |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 129 | #define SIZE32_MAX 0x7FFFFFFF |
| 130 | |
| 131 | #if SIZEOF_SIZE_T > 4 |
| 132 | # define W_SIZE(n, p) do { \ |
| 133 | if ((n) > SIZE32_MAX) { \ |
| 134 | (p)->depth--; \ |
| 135 | (p)->error = WFERR_UNMARSHALLABLE; \ |
| 136 | return; \ |
| 137 | } \ |
| 138 | w_long((long)(n), p); \ |
| 139 | } while(0) |
| 140 | #else |
| 141 | # define W_SIZE w_long |
| 142 | #endif |
| 143 | |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 144 | /* We assume that Python longs are stored internally in base some power of |
| 145 | 2**15; for the sake of portability we'll always read and write them in base |
| 146 | exactly 2**15. */ |
| 147 | |
| 148 | #define PyLong_MARSHAL_SHIFT 15 |
| 149 | #define PyLong_MARSHAL_BASE ((short)1 << PyLong_MARSHAL_SHIFT) |
| 150 | #define PyLong_MARSHAL_MASK (PyLong_MARSHAL_BASE - 1) |
| 151 | #if PyLong_SHIFT % PyLong_MARSHAL_SHIFT != 0 |
| 152 | #error "PyLong_SHIFT must be a multiple of PyLong_MARSHAL_SHIFT" |
| 153 | #endif |
| 154 | #define PyLong_MARSHAL_RATIO (PyLong_SHIFT / PyLong_MARSHAL_SHIFT) |
| 155 | |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 156 | #define W_TYPE(t, p) do { \ |
| 157 | w_byte((t) | flag, (p)); \ |
| 158 | } while(0) |
| 159 | |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 160 | static void |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 161 | w_PyLong(const PyLongObject *ob, char flag, WFILE *p) |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 162 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 163 | Py_ssize_t i, j, n, l; |
| 164 | digit d; |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 165 | |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 166 | W_TYPE(TYPE_LONG, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 167 | if (Py_SIZE(ob) == 0) { |
| 168 | w_long((long)0, p); |
| 169 | return; |
| 170 | } |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 171 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 172 | /* set l to number of base PyLong_MARSHAL_BASE digits */ |
| 173 | n = ABS(Py_SIZE(ob)); |
| 174 | l = (n-1) * PyLong_MARSHAL_RATIO; |
| 175 | d = ob->ob_digit[n-1]; |
| 176 | assert(d != 0); /* a PyLong is always normalized */ |
| 177 | do { |
| 178 | d >>= PyLong_MARSHAL_SHIFT; |
| 179 | l++; |
| 180 | } while (d != 0); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 181 | if (l > SIZE32_MAX) { |
| 182 | p->depth--; |
| 183 | p->error = WFERR_UNMARSHALLABLE; |
| 184 | return; |
| 185 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 186 | w_long((long)(Py_SIZE(ob) > 0 ? l : -l), p); |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 187 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 188 | for (i=0; i < n-1; i++) { |
| 189 | d = ob->ob_digit[i]; |
| 190 | for (j=0; j < PyLong_MARSHAL_RATIO; j++) { |
| 191 | w_short(d & PyLong_MARSHAL_MASK, p); |
| 192 | d >>= PyLong_MARSHAL_SHIFT; |
| 193 | } |
| 194 | assert (d == 0); |
| 195 | } |
| 196 | d = ob->ob_digit[n-1]; |
| 197 | do { |
| 198 | w_short(d & PyLong_MARSHAL_MASK, p); |
| 199 | d >>= PyLong_MARSHAL_SHIFT; |
| 200 | } while (d != 0); |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 201 | } |
| 202 | |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 203 | static int |
| 204 | w_ref(PyObject *v, char *flag, WFILE *p) |
| 205 | { |
| 206 | PyObject *id; |
| 207 | PyObject *idx; |
| 208 | |
| 209 | if (p->version < 3 || p->refs == NULL) |
| 210 | return 0; /* not writing object references */ |
| 211 | |
| 212 | /* if it has only one reference, it definitely isn't shared */ |
| 213 | if (Py_REFCNT(v) == 1) |
| 214 | return 0; |
| 215 | |
| 216 | id = PyLong_FromVoidPtr((void*)v); |
| 217 | if (id == NULL) |
| 218 | goto err; |
| 219 | idx = PyDict_GetItem(p->refs, id); |
| 220 | if (idx != NULL) { |
| 221 | /* write the reference index to the stream */ |
| 222 | long w = PyLong_AsLong(idx); |
| 223 | Py_DECREF(id); |
| 224 | if (w == -1 && PyErr_Occurred()) { |
| 225 | goto err; |
| 226 | } |
| 227 | /* we don't store "long" indices in the dict */ |
| 228 | assert(0 <= w && w <= 0x7fffffff); |
| 229 | w_byte(TYPE_REF, p); |
| 230 | w_long(w, p); |
| 231 | return 1; |
| 232 | } else { |
| 233 | int ok; |
| 234 | Py_ssize_t s = PyDict_Size(p->refs); |
| 235 | /* we don't support long indices */ |
| 236 | if (s >= 0x7fffffff) { |
| 237 | PyErr_SetString(PyExc_ValueError, "too many objects"); |
| 238 | goto err; |
| 239 | } |
| 240 | idx = PyLong_FromSsize_t(s); |
| 241 | ok = idx && PyDict_SetItem(p->refs, id, idx) == 0; |
| 242 | Py_DECREF(id); |
| 243 | Py_XDECREF(idx); |
| 244 | if (!ok) |
| 245 | goto err; |
| 246 | *flag |= FLAG_REF; |
| 247 | return 0; |
| 248 | } |
| 249 | err: |
| 250 | p->error = WFERR_UNMARSHALLABLE; |
| 251 | return 1; |
| 252 | } |
| 253 | |
| 254 | static void |
| 255 | w_complex_object(PyObject *v, char flag, WFILE *p); |
| 256 | |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 257 | static void |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 258 | w_object(PyObject *v, WFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 259 | { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 260 | char flag = '\0'; |
Fred Drake | 6da0b91 | 2000-06-28 18:47:56 +0000 | [diff] [blame] | 261 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 262 | p->depth++; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 263 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 264 | if (p->depth > MAX_MARSHAL_STACK_DEPTH) { |
| 265 | p->error = WFERR_NESTEDTOODEEP; |
| 266 | } |
| 267 | else if (v == NULL) { |
| 268 | w_byte(TYPE_NULL, p); |
| 269 | } |
| 270 | else if (v == Py_None) { |
| 271 | w_byte(TYPE_NONE, p); |
| 272 | } |
| 273 | else if (v == PyExc_StopIteration) { |
| 274 | w_byte(TYPE_STOPITER, p); |
| 275 | } |
| 276 | else if (v == Py_Ellipsis) { |
| 277 | w_byte(TYPE_ELLIPSIS, p); |
| 278 | } |
| 279 | else if (v == Py_False) { |
| 280 | w_byte(TYPE_FALSE, p); |
| 281 | } |
| 282 | else if (v == Py_True) { |
| 283 | w_byte(TYPE_TRUE, p); |
| 284 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 285 | else if (!w_ref(v, &flag, p)) |
| 286 | w_complex_object(v, flag, p); |
| 287 | |
| 288 | p->depth--; |
| 289 | } |
| 290 | |
| 291 | static void |
| 292 | w_complex_object(PyObject *v, char flag, WFILE *p) |
| 293 | { |
| 294 | Py_ssize_t i, n; |
| 295 | |
| 296 | if (PyLong_CheckExact(v)) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 297 | long x = PyLong_AsLong(v); |
| 298 | if ((x == -1) && PyErr_Occurred()) { |
| 299 | PyLongObject *ob = (PyLongObject *)v; |
| 300 | PyErr_Clear(); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 301 | w_PyLong(ob, flag, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 302 | } |
| 303 | else { |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 304 | #if SIZEOF_LONG > 4 |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 305 | long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31); |
| 306 | if (y && y != -1) { |
Martin v. Löwis | 7e39572 | 2012-07-28 19:44:05 +0200 | [diff] [blame] | 307 | /* Too large for TYPE_INT */ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 308 | w_PyLong((PyLongObject*)v, flag, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 309 | } |
| 310 | else |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 311 | #endif |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 312 | { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 313 | W_TYPE(TYPE_INT, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 314 | w_long(x, p); |
| 315 | } |
| 316 | } |
| 317 | } |
| 318 | else if (PyFloat_CheckExact(v)) { |
| 319 | if (p->version > 1) { |
| 320 | unsigned char buf[8]; |
| 321 | if (_PyFloat_Pack8(PyFloat_AsDouble(v), |
| 322 | buf, 1) < 0) { |
| 323 | p->error = WFERR_UNMARSHALLABLE; |
| 324 | return; |
| 325 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 326 | W_TYPE(TYPE_BINARY_FLOAT, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 327 | w_string((char*)buf, 8, p); |
| 328 | } |
| 329 | else { |
| 330 | char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v), |
| 331 | 'g', 17, 0, NULL); |
| 332 | if (!buf) { |
| 333 | p->error = WFERR_NOMEMORY; |
| 334 | return; |
| 335 | } |
| 336 | n = strlen(buf); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 337 | W_TYPE(TYPE_FLOAT, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 338 | w_byte((int)n, p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 339 | w_string(buf, n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 340 | PyMem_Free(buf); |
| 341 | } |
| 342 | } |
| 343 | else if (PyComplex_CheckExact(v)) { |
| 344 | if (p->version > 1) { |
| 345 | unsigned char buf[8]; |
| 346 | if (_PyFloat_Pack8(PyComplex_RealAsDouble(v), |
| 347 | buf, 1) < 0) { |
| 348 | p->error = WFERR_UNMARSHALLABLE; |
| 349 | return; |
| 350 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 351 | W_TYPE(TYPE_BINARY_COMPLEX, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 352 | w_string((char*)buf, 8, p); |
| 353 | if (_PyFloat_Pack8(PyComplex_ImagAsDouble(v), |
| 354 | buf, 1) < 0) { |
| 355 | p->error = WFERR_UNMARSHALLABLE; |
| 356 | return; |
| 357 | } |
| 358 | w_string((char*)buf, 8, p); |
| 359 | } |
| 360 | else { |
| 361 | char *buf; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 362 | W_TYPE(TYPE_COMPLEX, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 363 | buf = PyOS_double_to_string(PyComplex_RealAsDouble(v), |
| 364 | 'g', 17, 0, NULL); |
| 365 | if (!buf) { |
| 366 | p->error = WFERR_NOMEMORY; |
| 367 | return; |
| 368 | } |
| 369 | n = strlen(buf); |
| 370 | w_byte((int)n, p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 371 | w_string(buf, n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 372 | PyMem_Free(buf); |
| 373 | buf = PyOS_double_to_string(PyComplex_ImagAsDouble(v), |
| 374 | 'g', 17, 0, NULL); |
| 375 | if (!buf) { |
| 376 | p->error = WFERR_NOMEMORY; |
| 377 | return; |
| 378 | } |
| 379 | n = strlen(buf); |
| 380 | w_byte((int)n, p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 381 | w_string(buf, n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 382 | PyMem_Free(buf); |
| 383 | } |
| 384 | } |
| 385 | else if (PyBytes_CheckExact(v)) { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 386 | W_TYPE(TYPE_STRING, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 387 | n = PyBytes_GET_SIZE(v); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 388 | W_SIZE(n, p); |
| 389 | w_string(PyBytes_AS_STRING(v), n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 390 | } |
| 391 | else if (PyUnicode_CheckExact(v)) { |
| 392 | PyObject *utf8; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 393 | utf8 = PyUnicode_AsEncodedString(v, "utf8", "surrogatepass"); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 394 | if (utf8 == NULL) { |
| 395 | p->depth--; |
| 396 | p->error = WFERR_UNMARSHALLABLE; |
| 397 | return; |
| 398 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 399 | if (p->version >= 3 && PyUnicode_CHECK_INTERNED(v)) |
| 400 | W_TYPE(TYPE_INTERNED, p); |
| 401 | else |
| 402 | W_TYPE(TYPE_UNICODE, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 403 | n = PyBytes_GET_SIZE(utf8); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 404 | W_SIZE(n, p); |
| 405 | w_string(PyBytes_AS_STRING(utf8), n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 406 | Py_DECREF(utf8); |
| 407 | } |
| 408 | else if (PyTuple_CheckExact(v)) { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 409 | W_TYPE(TYPE_TUPLE, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 410 | n = PyTuple_Size(v); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 411 | W_SIZE(n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 412 | for (i = 0; i < n; i++) { |
| 413 | w_object(PyTuple_GET_ITEM(v, i), p); |
| 414 | } |
| 415 | } |
| 416 | else if (PyList_CheckExact(v)) { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 417 | W_TYPE(TYPE_LIST, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 418 | n = PyList_GET_SIZE(v); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 419 | W_SIZE(n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 420 | for (i = 0; i < n; i++) { |
| 421 | w_object(PyList_GET_ITEM(v, i), p); |
| 422 | } |
| 423 | } |
| 424 | else if (PyDict_CheckExact(v)) { |
| 425 | Py_ssize_t pos; |
| 426 | PyObject *key, *value; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 427 | W_TYPE(TYPE_DICT, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 428 | /* This one is NULL object terminated! */ |
| 429 | pos = 0; |
| 430 | while (PyDict_Next(v, &pos, &key, &value)) { |
| 431 | w_object(key, p); |
| 432 | w_object(value, p); |
| 433 | } |
| 434 | w_object((PyObject *)NULL, p); |
| 435 | } |
| 436 | else if (PyAnySet_CheckExact(v)) { |
| 437 | PyObject *value, *it; |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 438 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 439 | if (PyObject_TypeCheck(v, &PySet_Type)) |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 440 | W_TYPE(TYPE_SET, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 441 | else |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 442 | W_TYPE(TYPE_FROZENSET, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 443 | n = PyObject_Size(v); |
| 444 | if (n == -1) { |
| 445 | p->depth--; |
| 446 | p->error = WFERR_UNMARSHALLABLE; |
| 447 | return; |
| 448 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 449 | W_SIZE(n, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 450 | it = PyObject_GetIter(v); |
| 451 | if (it == NULL) { |
| 452 | p->depth--; |
| 453 | p->error = WFERR_UNMARSHALLABLE; |
| 454 | return; |
| 455 | } |
| 456 | while ((value = PyIter_Next(it)) != NULL) { |
| 457 | w_object(value, p); |
| 458 | Py_DECREF(value); |
| 459 | } |
| 460 | Py_DECREF(it); |
| 461 | if (PyErr_Occurred()) { |
| 462 | p->depth--; |
| 463 | p->error = WFERR_UNMARSHALLABLE; |
| 464 | return; |
| 465 | } |
| 466 | } |
| 467 | else if (PyCode_Check(v)) { |
| 468 | PyCodeObject *co = (PyCodeObject *)v; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 469 | W_TYPE(TYPE_CODE, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 470 | w_long(co->co_argcount, p); |
| 471 | w_long(co->co_kwonlyargcount, p); |
| 472 | w_long(co->co_nlocals, p); |
| 473 | w_long(co->co_stacksize, p); |
| 474 | w_long(co->co_flags, p); |
| 475 | w_object(co->co_code, p); |
| 476 | w_object(co->co_consts, p); |
| 477 | w_object(co->co_names, p); |
| 478 | w_object(co->co_varnames, p); |
| 479 | w_object(co->co_freevars, p); |
| 480 | w_object(co->co_cellvars, p); |
| 481 | w_object(co->co_filename, p); |
| 482 | w_object(co->co_name, p); |
| 483 | w_long(co->co_firstlineno, p); |
| 484 | w_object(co->co_lnotab, p); |
| 485 | } |
| 486 | else if (PyObject_CheckBuffer(v)) { |
| 487 | /* Write unknown buffer-style objects as a string */ |
| 488 | char *s; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 489 | Py_buffer view; |
Antoine Pitrou | 679e9d3 | 2012-03-02 18:12:43 +0100 | [diff] [blame] | 490 | if (PyObject_GetBuffer(v, &view, PyBUF_SIMPLE) != 0) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 491 | w_byte(TYPE_UNKNOWN, p); |
Antoine Pitrou | 679e9d3 | 2012-03-02 18:12:43 +0100 | [diff] [blame] | 492 | p->depth--; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 493 | p->error = WFERR_UNMARSHALLABLE; |
Antoine Pitrou | 679e9d3 | 2012-03-02 18:12:43 +0100 | [diff] [blame] | 494 | return; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 495 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 496 | W_TYPE(TYPE_STRING, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 497 | n = view.len; |
| 498 | s = view.buf; |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 499 | W_SIZE(n, p); |
| 500 | w_string(s, n, p); |
Antoine Pitrou | 679e9d3 | 2012-03-02 18:12:43 +0100 | [diff] [blame] | 501 | PyBuffer_Release(&view); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 502 | } |
| 503 | else { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 504 | W_TYPE(TYPE_UNKNOWN, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 505 | p->error = WFERR_UNMARSHALLABLE; |
| 506 | } |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 507 | } |
| 508 | |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 509 | /* version currently has no effect for writing longs. */ |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 510 | void |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 511 | PyMarshal_WriteLongToFile(long x, FILE *fp, int version) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 512 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 513 | WFILE wf; |
| 514 | wf.fp = fp; |
| 515 | wf.error = WFERR_OK; |
| 516 | wf.depth = 0; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 517 | wf.refs = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 518 | wf.version = version; |
| 519 | w_long(x, &wf); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 520 | } |
| 521 | |
| 522 | void |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 523 | PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp, int version) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 524 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 525 | WFILE wf; |
| 526 | wf.fp = fp; |
| 527 | wf.error = WFERR_OK; |
| 528 | wf.depth = 0; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 529 | if (version >= 3) { |
| 530 | if ((wf.refs = PyDict_New()) == NULL) |
| 531 | return; /* caller mush check PyErr_Occurred() */ |
| 532 | } else |
| 533 | wf.refs = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 534 | wf.version = version; |
| 535 | w_object(x, &wf); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 536 | Py_XDECREF(wf.refs); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 537 | } |
| 538 | |
| 539 | typedef WFILE RFILE; /* Same struct with different invariants */ |
| 540 | |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 541 | #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] | 542 | |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 543 | static Py_ssize_t |
| 544 | r_string(char *s, Py_ssize_t n, RFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 545 | { |
Éric Araujo | 6c0ba44 | 2011-07-26 17:23:57 +0200 | [diff] [blame] | 546 | char *ptr; |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 547 | Py_ssize_t read, left; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 548 | |
| 549 | if (!p->readable) { |
| 550 | if (p->fp != NULL) |
| 551 | /* The result fits into int because it must be <=n. */ |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 552 | read = fread(s, 1, n, p->fp); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 553 | else { |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 554 | left = p->end - p->ptr; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 555 | read = (left < n) ? left : n; |
| 556 | memcpy(s, p->ptr, read); |
| 557 | p->ptr += read; |
| 558 | } |
| 559 | } |
| 560 | else { |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 561 | _Py_IDENTIFIER(read); |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 562 | |
Serhiy Storchaka | 5a1f152 | 2013-02-13 12:11:03 +0200 | [diff] [blame] | 563 | PyObject *data = _PyObject_CallMethodId(p->readable, &PyId_read, "n", n); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 564 | read = 0; |
| 565 | if (data != NULL) { |
| 566 | if (!PyBytes_Check(data)) { |
| 567 | PyErr_Format(PyExc_TypeError, |
| 568 | "f.read() returned not bytes but %.100s", |
| 569 | data->ob_type->tp_name); |
| 570 | } |
| 571 | else { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 572 | read = (int)PyBytes_GET_SIZE(data); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 573 | if (read > 0) { |
| 574 | ptr = PyBytes_AS_STRING(data); |
| 575 | memcpy(s, ptr, read); |
| 576 | } |
| 577 | } |
| 578 | Py_DECREF(data); |
| 579 | } |
| 580 | } |
| 581 | if (!PyErr_Occurred() && (read < n)) { |
| 582 | PyErr_SetString(PyExc_EOFError, "EOF read where not expected"); |
| 583 | } |
| 584 | return read; |
| 585 | } |
| 586 | |
| 587 | |
| 588 | static int |
| 589 | r_byte(RFILE *p) |
| 590 | { |
| 591 | int c = EOF; |
| 592 | unsigned char ch; |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 593 | Py_ssize_t n; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 594 | |
| 595 | if (!p->readable) |
| 596 | c = p->fp ? getc(p->fp) : rs_byte(p); |
| 597 | else { |
| 598 | n = r_string((char *) &ch, 1, p); |
| 599 | if (n > 0) |
| 600 | c = ch; |
| 601 | } |
| 602 | return c; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 603 | } |
| 604 | |
| 605 | static int |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 606 | r_short(RFILE *p) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 607 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 608 | register short x; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 609 | unsigned char buffer[2]; |
| 610 | |
| 611 | r_string((char *) buffer, 2, p); |
| 612 | x = buffer[0]; |
| 613 | x |= buffer[1] << 8; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 614 | /* Sign-extension, in case short greater than 16 bits */ |
| 615 | x |= -(x & 0x8000); |
| 616 | return x; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 617 | } |
| 618 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 619 | static long |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 620 | r_long(RFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 621 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 622 | register long x; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 623 | unsigned char buffer[4]; |
| 624 | |
| 625 | r_string((char *) buffer, 4, p); |
| 626 | x = buffer[0]; |
| 627 | x |= (long)buffer[1] << 8; |
| 628 | x |= (long)buffer[2] << 16; |
| 629 | x |= (long)buffer[3] << 24; |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 630 | #if SIZEOF_LONG > 4 |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 631 | /* Sign extension for 64-bit machines */ |
| 632 | x |= -(x & 0x80000000L); |
Guido van Rossum | c1547d9 | 1996-12-10 15:39:04 +0000 | [diff] [blame] | 633 | #endif |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 634 | return x; |
Guido van Rossum | b0c168c | 1996-12-05 23:15:02 +0000 | [diff] [blame] | 635 | } |
| 636 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 637 | static PyObject * |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 638 | r_PyLong(RFILE *p) |
| 639 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 640 | PyLongObject *ob; |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 641 | long n, size, i; |
| 642 | int j, md, shorts_in_top_digit; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 643 | digit d; |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 644 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 645 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 646 | if (PyErr_Occurred()) |
| 647 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 648 | if (n == 0) |
| 649 | return (PyObject *)_PyLong_New(0); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 650 | if (n < -SIZE32_MAX || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 651 | PyErr_SetString(PyExc_ValueError, |
| 652 | "bad marshal data (long size out of range)"); |
| 653 | return NULL; |
| 654 | } |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 655 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 656 | size = 1 + (ABS(n) - 1) / PyLong_MARSHAL_RATIO; |
| 657 | shorts_in_top_digit = 1 + (ABS(n) - 1) % PyLong_MARSHAL_RATIO; |
| 658 | ob = _PyLong_New(size); |
| 659 | if (ob == NULL) |
| 660 | return NULL; |
| 661 | Py_SIZE(ob) = n > 0 ? size : -size; |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 662 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 663 | for (i = 0; i < size-1; i++) { |
| 664 | d = 0; |
| 665 | for (j=0; j < PyLong_MARSHAL_RATIO; j++) { |
| 666 | md = r_short(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 667 | if (PyErr_Occurred()) |
| 668 | break; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 669 | if (md < 0 || md > PyLong_MARSHAL_BASE) |
| 670 | goto bad_digit; |
| 671 | d += (digit)md << j*PyLong_MARSHAL_SHIFT; |
| 672 | } |
| 673 | ob->ob_digit[i] = d; |
| 674 | } |
| 675 | d = 0; |
| 676 | for (j=0; j < shorts_in_top_digit; j++) { |
| 677 | md = r_short(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 678 | if (PyErr_Occurred()) |
| 679 | break; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 680 | if (md < 0 || md > PyLong_MARSHAL_BASE) |
| 681 | goto bad_digit; |
| 682 | /* topmost marshal digit should be nonzero */ |
| 683 | if (md == 0 && j == shorts_in_top_digit - 1) { |
| 684 | Py_DECREF(ob); |
| 685 | PyErr_SetString(PyExc_ValueError, |
| 686 | "bad marshal data (unnormalized long data)"); |
| 687 | return NULL; |
| 688 | } |
| 689 | d += (digit)md << j*PyLong_MARSHAL_SHIFT; |
| 690 | } |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 691 | if (PyErr_Occurred()) { |
| 692 | Py_DECREF(ob); |
| 693 | return NULL; |
| 694 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 695 | /* top digit should be nonzero, else the resulting PyLong won't be |
| 696 | normalized */ |
| 697 | ob->ob_digit[size-1] = d; |
| 698 | return (PyObject *)ob; |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 699 | bad_digit: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 700 | Py_DECREF(ob); |
| 701 | PyErr_SetString(PyExc_ValueError, |
| 702 | "bad marshal data (digit out of range in long)"); |
| 703 | return NULL; |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 704 | } |
| 705 | |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 706 | /* allocate the reflist index for a new object. Return -1 on failure */ |
| 707 | static Py_ssize_t |
| 708 | r_ref_reserve(int flag, RFILE *p) |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 709 | { |
| 710 | if (flag) { /* currently only FLAG_REF is defined */ |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 711 | Py_ssize_t idx = PyList_Size(p->refs); |
| 712 | if (idx < 0) |
| 713 | return -1; |
| 714 | if (idx >= 0x7ffffffe) { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 715 | PyErr_SetString(PyExc_ValueError, "bad marshal data (index list too large)"); |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 716 | return -1; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 717 | } |
| 718 | if (PyList_Append(p->refs, Py_None) < 0) |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 719 | return -1; |
| 720 | return idx; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 721 | } else |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 722 | return 0; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 723 | } |
| 724 | |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 725 | /* insert the new object 'o' to the reflist at previously |
| 726 | * allocated index 'idx'. |
| 727 | * 'o' can be NULL, in which case nothing is done. |
| 728 | * if 'o' was non-NULL, and the function succeeds, 'o' is returned. |
| 729 | * if 'o' was non-NULL, and the function fails, 'o' is released and |
| 730 | * NULL returned. This simplifies error checking at the call site since |
| 731 | * a single test for NULL for the function result is enough. |
| 732 | */ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 733 | static PyObject * |
| 734 | r_ref_insert(PyObject *o, Py_ssize_t idx, int flag, RFILE *p) |
| 735 | { |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 736 | if (o != NULL && flag) { /* currently only FLAG_REF is defined */ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 737 | if (PyList_SetItem(p->refs, idx, o) < 0) { |
| 738 | Py_DECREF(o); /* release the new object */ |
| 739 | return NULL; |
| 740 | } else { |
| 741 | Py_INCREF(o); /* a reference for the list */ |
| 742 | } |
| 743 | } |
| 744 | return o; |
| 745 | } |
| 746 | |
| 747 | /* combination of both above, used when an object can be |
| 748 | * created whenever it is seen in the file, as opposed to |
| 749 | * after having loaded its sub-objects. |
| 750 | */ |
| 751 | static PyObject * |
| 752 | r_ref(PyObject *o, int flag, RFILE *p) |
| 753 | { |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 754 | if (o != NULL && flag) { /* currently only FLAG_REF is defined */ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 755 | if (PyList_Append(p->refs, o) < 0) { |
| 756 | Py_DECREF(o); /* release the new object */ |
| 757 | return NULL; |
| 758 | } |
| 759 | } |
| 760 | return o; |
| 761 | } |
Mark Dickinson | bd79264 | 2009-03-18 20:06:12 +0000 | [diff] [blame] | 762 | |
| 763 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 764 | r_object(RFILE *p) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 765 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 766 | /* NULL is a valid return value, it does not necessarily means that |
| 767 | an exception is set. */ |
| 768 | PyObject *v, *v2; |
Benjamin Peterson | eddb0a7 | 2013-03-20 00:40:07 -0500 | [diff] [blame] | 769 | Py_ssize_t idx = 0; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 770 | long i, n; |
Kristján Valur Jónsson | 6168362 | 2013-03-20 14:26:33 -0700 | [diff] [blame] | 771 | int type, code = r_byte(p); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 772 | int flag; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 773 | PyObject *retval; |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 774 | |
Kristján Valur Jónsson | 6168362 | 2013-03-20 14:26:33 -0700 | [diff] [blame] | 775 | if (code == EOF) { |
| 776 | PyErr_SetString(PyExc_EOFError, |
| 777 | "EOF read where object expected"); |
| 778 | return NULL; |
| 779 | } |
| 780 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 781 | p->depth++; |
Guido van Rossum | d59da4b | 2007-05-22 18:11:13 +0000 | [diff] [blame] | 782 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 783 | if (p->depth > MAX_MARSHAL_STACK_DEPTH) { |
| 784 | p->depth--; |
| 785 | PyErr_SetString(PyExc_ValueError, "recursion limit exceeded"); |
| 786 | return NULL; |
| 787 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 788 | |
Kristján Valur Jónsson | 6168362 | 2013-03-20 14:26:33 -0700 | [diff] [blame] | 789 | flag = code & FLAG_REF; |
| 790 | type = code & ~FLAG_REF; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 791 | |
| 792 | #define R_REF(O) do{\ |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 793 | if (flag) \ |
| 794 | O = r_ref(O, flag, p);\ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 795 | } while (0) |
| 796 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 797 | switch (type) { |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 798 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 799 | case TYPE_NULL: |
| 800 | retval = NULL; |
| 801 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 802 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 803 | case TYPE_NONE: |
| 804 | Py_INCREF(Py_None); |
| 805 | retval = Py_None; |
| 806 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 807 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 808 | case TYPE_STOPITER: |
| 809 | Py_INCREF(PyExc_StopIteration); |
| 810 | retval = PyExc_StopIteration; |
| 811 | break; |
Tim Peters | 5ca576e | 2001-06-18 22:08:13 +0000 | [diff] [blame] | 812 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 813 | case TYPE_ELLIPSIS: |
| 814 | Py_INCREF(Py_Ellipsis); |
| 815 | retval = Py_Ellipsis; |
| 816 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 817 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 818 | case TYPE_FALSE: |
| 819 | Py_INCREF(Py_False); |
| 820 | retval = Py_False; |
| 821 | break; |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 822 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 823 | case TYPE_TRUE: |
| 824 | Py_INCREF(Py_True); |
| 825 | retval = Py_True; |
| 826 | break; |
Guido van Rossum | 77f6a65 | 2002-04-03 22:41:51 +0000 | [diff] [blame] | 827 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 828 | case TYPE_INT: |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 829 | n = r_long(p); |
| 830 | retval = PyErr_Occurred() ? NULL : PyLong_FromLong(n); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 831 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 832 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 833 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 834 | case TYPE_LONG: |
| 835 | retval = r_PyLong(p); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 836 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 837 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 838 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 839 | case TYPE_FLOAT: |
| 840 | { |
| 841 | char buf[256]; |
| 842 | double dx; |
| 843 | retval = NULL; |
| 844 | n = r_byte(p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 845 | if (n == EOF || r_string(buf, n, p) != n) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 846 | PyErr_SetString(PyExc_EOFError, |
| 847 | "EOF read where object expected"); |
| 848 | break; |
| 849 | } |
| 850 | buf[n] = '\0'; |
| 851 | dx = PyOS_string_to_double(buf, NULL, NULL); |
| 852 | if (dx == -1.0 && PyErr_Occurred()) |
| 853 | break; |
| 854 | retval = PyFloat_FromDouble(dx); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 855 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 856 | break; |
| 857 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 858 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 859 | case TYPE_BINARY_FLOAT: |
| 860 | { |
| 861 | unsigned char buf[8]; |
| 862 | double x; |
| 863 | if (r_string((char*)buf, 8, p) != 8) { |
| 864 | PyErr_SetString(PyExc_EOFError, |
| 865 | "EOF read where object expected"); |
| 866 | retval = NULL; |
| 867 | break; |
| 868 | } |
| 869 | x = _PyFloat_Unpack8(buf, 1); |
| 870 | if (x == -1.0 && PyErr_Occurred()) { |
| 871 | retval = NULL; |
| 872 | break; |
| 873 | } |
| 874 | retval = PyFloat_FromDouble(x); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 875 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 876 | break; |
| 877 | } |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 878 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 879 | case TYPE_COMPLEX: |
| 880 | { |
| 881 | char buf[256]; |
| 882 | Py_complex c; |
| 883 | retval = NULL; |
| 884 | n = r_byte(p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 885 | if (n == EOF || r_string(buf, n, p) != n) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 886 | PyErr_SetString(PyExc_EOFError, |
| 887 | "EOF read where object expected"); |
| 888 | break; |
| 889 | } |
| 890 | buf[n] = '\0'; |
| 891 | c.real = PyOS_string_to_double(buf, NULL, NULL); |
| 892 | if (c.real == -1.0 && PyErr_Occurred()) |
| 893 | break; |
| 894 | n = r_byte(p); |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 895 | if (n == EOF || r_string(buf, n, p) != n) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 896 | PyErr_SetString(PyExc_EOFError, |
| 897 | "EOF read where object expected"); |
| 898 | break; |
| 899 | } |
| 900 | buf[n] = '\0'; |
| 901 | c.imag = PyOS_string_to_double(buf, NULL, NULL); |
| 902 | if (c.imag == -1.0 && PyErr_Occurred()) |
| 903 | break; |
| 904 | retval = PyComplex_FromCComplex(c); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 905 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 906 | break; |
| 907 | } |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 908 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 909 | case TYPE_BINARY_COMPLEX: |
| 910 | { |
| 911 | unsigned char buf[8]; |
| 912 | Py_complex c; |
| 913 | if (r_string((char*)buf, 8, p) != 8) { |
| 914 | PyErr_SetString(PyExc_EOFError, |
| 915 | "EOF read where object expected"); |
| 916 | retval = NULL; |
| 917 | break; |
| 918 | } |
| 919 | c.real = _PyFloat_Unpack8(buf, 1); |
| 920 | if (c.real == -1.0 && PyErr_Occurred()) { |
| 921 | retval = NULL; |
| 922 | break; |
| 923 | } |
| 924 | if (r_string((char*)buf, 8, p) != 8) { |
| 925 | PyErr_SetString(PyExc_EOFError, |
| 926 | "EOF read where object expected"); |
| 927 | retval = NULL; |
| 928 | break; |
| 929 | } |
| 930 | c.imag = _PyFloat_Unpack8(buf, 1); |
| 931 | if (c.imag == -1.0 && PyErr_Occurred()) { |
| 932 | retval = NULL; |
| 933 | break; |
| 934 | } |
| 935 | retval = PyComplex_FromCComplex(c); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 936 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 937 | break; |
| 938 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 939 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 940 | case TYPE_STRING: |
| 941 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 942 | if (PyErr_Occurred()) { |
| 943 | retval = NULL; |
| 944 | break; |
| 945 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 946 | if (n < 0 || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 947 | PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)"); |
| 948 | retval = NULL; |
| 949 | break; |
| 950 | } |
| 951 | v = PyBytes_FromStringAndSize((char *)NULL, n); |
| 952 | if (v == NULL) { |
| 953 | retval = NULL; |
| 954 | break; |
| 955 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 956 | if (r_string(PyBytes_AS_STRING(v), n, p) != n) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 957 | Py_DECREF(v); |
| 958 | PyErr_SetString(PyExc_EOFError, |
| 959 | "EOF read where object expected"); |
| 960 | retval = NULL; |
| 961 | break; |
| 962 | } |
| 963 | retval = v; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 964 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 965 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 966 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 967 | case TYPE_UNICODE: |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 968 | case TYPE_INTERNED: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 969 | { |
| 970 | char *buffer; |
Guido van Rossum | c279b53 | 2000-03-10 23:03:02 +0000 | [diff] [blame] | 971 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 972 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 973 | if (PyErr_Occurred()) { |
| 974 | retval = NULL; |
| 975 | break; |
| 976 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 977 | if (n < 0 || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 978 | PyErr_SetString(PyExc_ValueError, "bad marshal data (unicode size out of range)"); |
| 979 | retval = NULL; |
| 980 | break; |
| 981 | } |
| 982 | buffer = PyMem_NEW(char, n); |
| 983 | if (buffer == NULL) { |
| 984 | retval = PyErr_NoMemory(); |
| 985 | break; |
| 986 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 987 | if (r_string(buffer, n, p) != n) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 988 | PyMem_DEL(buffer); |
| 989 | PyErr_SetString(PyExc_EOFError, |
| 990 | "EOF read where object expected"); |
| 991 | retval = NULL; |
| 992 | break; |
| 993 | } |
| 994 | v = PyUnicode_DecodeUTF8(buffer, n, "surrogatepass"); |
| 995 | PyMem_DEL(buffer); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 996 | if (type == TYPE_INTERNED) |
| 997 | PyUnicode_InternInPlace(&v); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 998 | retval = v; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 999 | R_REF(retval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1000 | break; |
| 1001 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1002 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1003 | case TYPE_TUPLE: |
| 1004 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1005 | if (PyErr_Occurred()) { |
| 1006 | retval = NULL; |
| 1007 | break; |
| 1008 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1009 | if (n < 0 || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1010 | PyErr_SetString(PyExc_ValueError, "bad marshal data (tuple size out of range)"); |
| 1011 | retval = NULL; |
| 1012 | break; |
| 1013 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1014 | v = PyTuple_New(n); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1015 | R_REF(v); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1016 | if (v == NULL) { |
| 1017 | retval = NULL; |
| 1018 | break; |
| 1019 | } |
| 1020 | for (i = 0; i < n; i++) { |
| 1021 | v2 = r_object(p); |
| 1022 | if ( v2 == NULL ) { |
| 1023 | if (!PyErr_Occurred()) |
| 1024 | PyErr_SetString(PyExc_TypeError, |
| 1025 | "NULL object in marshal data for tuple"); |
| 1026 | Py_DECREF(v); |
| 1027 | v = NULL; |
| 1028 | break; |
| 1029 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1030 | PyTuple_SET_ITEM(v, i, v2); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1031 | } |
| 1032 | retval = v; |
| 1033 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1034 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1035 | case TYPE_LIST: |
| 1036 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1037 | if (PyErr_Occurred()) { |
| 1038 | retval = NULL; |
| 1039 | break; |
| 1040 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1041 | if (n < 0 || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1042 | PyErr_SetString(PyExc_ValueError, "bad marshal data (list size out of range)"); |
| 1043 | retval = NULL; |
| 1044 | break; |
| 1045 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1046 | v = PyList_New(n); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1047 | R_REF(v); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1048 | if (v == NULL) { |
| 1049 | retval = NULL; |
| 1050 | break; |
| 1051 | } |
| 1052 | for (i = 0; i < n; i++) { |
| 1053 | v2 = r_object(p); |
| 1054 | if ( v2 == NULL ) { |
| 1055 | if (!PyErr_Occurred()) |
| 1056 | PyErr_SetString(PyExc_TypeError, |
| 1057 | "NULL object in marshal data for list"); |
| 1058 | Py_DECREF(v); |
| 1059 | v = NULL; |
| 1060 | break; |
| 1061 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1062 | PyList_SET_ITEM(v, i, v2); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1063 | } |
| 1064 | retval = v; |
| 1065 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1066 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1067 | case TYPE_DICT: |
| 1068 | v = PyDict_New(); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1069 | R_REF(v); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1070 | if (v == NULL) { |
| 1071 | retval = NULL; |
| 1072 | break; |
| 1073 | } |
| 1074 | for (;;) { |
| 1075 | PyObject *key, *val; |
| 1076 | key = r_object(p); |
| 1077 | if (key == NULL) |
| 1078 | break; |
| 1079 | val = r_object(p); |
| 1080 | if (val != NULL) |
| 1081 | PyDict_SetItem(v, key, val); |
| 1082 | Py_DECREF(key); |
| 1083 | Py_XDECREF(val); |
| 1084 | } |
| 1085 | if (PyErr_Occurred()) { |
| 1086 | Py_DECREF(v); |
| 1087 | v = NULL; |
| 1088 | } |
| 1089 | retval = v; |
| 1090 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1091 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1092 | case TYPE_SET: |
| 1093 | case TYPE_FROZENSET: |
| 1094 | n = r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1095 | if (PyErr_Occurred()) { |
| 1096 | retval = NULL; |
| 1097 | break; |
| 1098 | } |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1099 | if (n < 0 || n > SIZE32_MAX) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1100 | PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)"); |
| 1101 | retval = NULL; |
| 1102 | break; |
| 1103 | } |
| 1104 | v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL); |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 1105 | if (type == TYPE_SET) { |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1106 | R_REF(v); |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 1107 | } else { |
| 1108 | /* must use delayed registration of frozensets because they must |
| 1109 | * be init with a refcount of 1 |
| 1110 | */ |
| 1111 | idx = r_ref_reserve(flag, p); |
| 1112 | if (idx < 0) |
| 1113 | Py_CLEAR(v); /* signal error */ |
| 1114 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1115 | if (v == NULL) { |
| 1116 | retval = NULL; |
| 1117 | break; |
| 1118 | } |
| 1119 | for (i = 0; i < n; i++) { |
| 1120 | v2 = r_object(p); |
| 1121 | if ( v2 == NULL ) { |
| 1122 | if (!PyErr_Occurred()) |
| 1123 | PyErr_SetString(PyExc_TypeError, |
| 1124 | "NULL object in marshal data for set"); |
| 1125 | Py_DECREF(v); |
| 1126 | v = NULL; |
| 1127 | break; |
| 1128 | } |
| 1129 | if (PySet_Add(v, v2) == -1) { |
| 1130 | Py_DECREF(v); |
| 1131 | Py_DECREF(v2); |
| 1132 | v = NULL; |
| 1133 | break; |
| 1134 | } |
| 1135 | Py_DECREF(v2); |
| 1136 | } |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1137 | if (type != TYPE_SET) |
| 1138 | v = r_ref_insert(v, idx, flag, p); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1139 | retval = v; |
| 1140 | break; |
Raymond Hettinger | a422c34 | 2005-01-11 03:03:27 +0000 | [diff] [blame] | 1141 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1142 | case TYPE_CODE: |
| 1143 | { |
| 1144 | int argcount; |
| 1145 | int kwonlyargcount; |
| 1146 | int nlocals; |
| 1147 | int stacksize; |
| 1148 | int flags; |
| 1149 | PyObject *code = NULL; |
| 1150 | PyObject *consts = NULL; |
| 1151 | PyObject *names = NULL; |
| 1152 | PyObject *varnames = NULL; |
| 1153 | PyObject *freevars = NULL; |
| 1154 | PyObject *cellvars = NULL; |
| 1155 | PyObject *filename = NULL; |
| 1156 | PyObject *name = NULL; |
| 1157 | int firstlineno; |
| 1158 | PyObject *lnotab = NULL; |
Antoine Pitrou | e9bbe8b | 2013-04-13 22:41:09 +0200 | [diff] [blame] | 1159 | |
Kristján Valur Jónsson | e178187 | 2013-03-20 11:43:57 -0700 | [diff] [blame] | 1160 | idx = r_ref_reserve(flag, p); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1161 | if (idx < 0) { |
| 1162 | retval = NULL; |
| 1163 | break; |
| 1164 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1165 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1166 | v = NULL; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 1167 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1168 | /* XXX ignore long->int overflows for now */ |
| 1169 | argcount = (int)r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1170 | if (PyErr_Occurred()) |
| 1171 | goto code_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1172 | kwonlyargcount = (int)r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1173 | if (PyErr_Occurred()) |
| 1174 | goto code_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1175 | nlocals = (int)r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1176 | if (PyErr_Occurred()) |
| 1177 | goto code_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1178 | stacksize = (int)r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1179 | if (PyErr_Occurred()) |
| 1180 | goto code_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1181 | flags = (int)r_long(p); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1182 | if (PyErr_Occurred()) |
| 1183 | goto code_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1184 | code = r_object(p); |
| 1185 | if (code == NULL) |
| 1186 | goto code_error; |
| 1187 | consts = r_object(p); |
| 1188 | if (consts == NULL) |
| 1189 | goto code_error; |
| 1190 | names = r_object(p); |
| 1191 | if (names == NULL) |
| 1192 | goto code_error; |
| 1193 | varnames = r_object(p); |
| 1194 | if (varnames == NULL) |
| 1195 | goto code_error; |
| 1196 | freevars = r_object(p); |
| 1197 | if (freevars == NULL) |
| 1198 | goto code_error; |
| 1199 | cellvars = r_object(p); |
| 1200 | if (cellvars == NULL) |
| 1201 | goto code_error; |
| 1202 | filename = r_object(p); |
| 1203 | if (filename == NULL) |
| 1204 | goto code_error; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1205 | if (PyUnicode_CheckExact(filename)) { |
| 1206 | if (p->current_filename != NULL) { |
| 1207 | if (!PyUnicode_Compare(filename, p->current_filename)) { |
| 1208 | Py_DECREF(filename); |
| 1209 | Py_INCREF(p->current_filename); |
| 1210 | filename = p->current_filename; |
| 1211 | } |
| 1212 | } |
| 1213 | else { |
| 1214 | p->current_filename = filename; |
| 1215 | } |
| 1216 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1217 | name = r_object(p); |
| 1218 | if (name == NULL) |
| 1219 | goto code_error; |
| 1220 | firstlineno = (int)r_long(p); |
| 1221 | lnotab = r_object(p); |
| 1222 | if (lnotab == NULL) |
| 1223 | goto code_error; |
Michael W. Hudson | df88846 | 2005-06-03 14:41:55 +0000 | [diff] [blame] | 1224 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1225 | v = (PyObject *) PyCode_New( |
| 1226 | argcount, kwonlyargcount, |
| 1227 | nlocals, stacksize, flags, |
| 1228 | code, consts, names, varnames, |
| 1229 | freevars, cellvars, filename, name, |
| 1230 | firstlineno, lnotab); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1231 | v = r_ref_insert(v, idx, flag, p); |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1232 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1233 | code_error: |
| 1234 | Py_XDECREF(code); |
| 1235 | Py_XDECREF(consts); |
| 1236 | Py_XDECREF(names); |
| 1237 | Py_XDECREF(varnames); |
| 1238 | Py_XDECREF(freevars); |
| 1239 | Py_XDECREF(cellvars); |
| 1240 | Py_XDECREF(filename); |
| 1241 | Py_XDECREF(name); |
| 1242 | Py_XDECREF(lnotab); |
| 1243 | } |
| 1244 | retval = v; |
| 1245 | break; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1246 | |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1247 | case TYPE_REF: |
| 1248 | n = r_long(p); |
| 1249 | if (n < 0 || n >= PyList_GET_SIZE(p->refs)) { |
| 1250 | PyErr_SetString(PyExc_ValueError, "bad marshal data (invalid reference)"); |
| 1251 | retval = NULL; |
| 1252 | break; |
| 1253 | } |
| 1254 | v = PyList_GET_ITEM(p->refs, n); |
| 1255 | if (v == Py_None) { |
| 1256 | PyErr_SetString(PyExc_ValueError, "bad marshal data (invalid reference)"); |
| 1257 | retval = NULL; |
| 1258 | break; |
| 1259 | } |
| 1260 | Py_INCREF(v); |
| 1261 | retval = v; |
| 1262 | break; |
| 1263 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1264 | default: |
| 1265 | /* Bogus data got written, which isn't ideal. |
| 1266 | This will let you keep working and recover. */ |
| 1267 | PyErr_SetString(PyExc_ValueError, "bad marshal data (unknown type code)"); |
| 1268 | retval = NULL; |
| 1269 | break; |
| 1270 | |
| 1271 | } |
| 1272 | p->depth--; |
| 1273 | return retval; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1274 | } |
| 1275 | |
Neal Norwitz | d85c452 | 2004-06-13 20:31:49 +0000 | [diff] [blame] | 1276 | static PyObject * |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 1277 | read_object(RFILE *p) |
| 1278 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1279 | PyObject *v; |
| 1280 | if (PyErr_Occurred()) { |
| 1281 | fprintf(stderr, "XXX readobject called with exception set\n"); |
| 1282 | return NULL; |
| 1283 | } |
| 1284 | v = r_object(p); |
| 1285 | if (v == NULL && !PyErr_Occurred()) |
| 1286 | PyErr_SetString(PyExc_TypeError, "NULL object in marshal data for object"); |
| 1287 | return v; |
Armin Rigo | 01ab279 | 2004-03-26 15:09:27 +0000 | [diff] [blame] | 1288 | } |
| 1289 | |
Guido van Rossum | b8cf3e6 | 2001-10-19 01:46:21 +0000 | [diff] [blame] | 1290 | int |
| 1291 | PyMarshal_ReadShortFromFile(FILE *fp) |
| 1292 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1293 | RFILE rf; |
| 1294 | assert(fp); |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1295 | rf.readable = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1296 | rf.fp = fp; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1297 | rf.current_filename = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1298 | rf.end = rf.ptr = NULL; |
| 1299 | return r_short(&rf); |
Guido van Rossum | b8cf3e6 | 2001-10-19 01:46:21 +0000 | [diff] [blame] | 1300 | } |
| 1301 | |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1302 | long |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1303 | PyMarshal_ReadLongFromFile(FILE *fp) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1304 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1305 | RFILE rf; |
| 1306 | rf.fp = fp; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1307 | rf.readable = NULL; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1308 | rf.current_filename = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1309 | rf.ptr = rf.end = NULL; |
| 1310 | return r_long(&rf); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1311 | } |
| 1312 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1313 | #ifdef HAVE_FSTAT |
| 1314 | /* Return size of file in bytes; < 0 if unknown. */ |
| 1315 | static off_t |
| 1316 | getfilesize(FILE *fp) |
| 1317 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1318 | struct stat st; |
| 1319 | if (fstat(fileno(fp), &st) != 0) |
| 1320 | return -1; |
| 1321 | else |
| 1322 | return st.st_size; |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1323 | } |
| 1324 | #endif |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1325 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1326 | /* If we can get the size of the file up-front, and it's reasonably small, |
| 1327 | * read it in one gulp and delegate to ...FromString() instead. Much quicker |
| 1328 | * than reading a byte at a time from file; speeds .pyc imports. |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1329 | * CAUTION: since this may read the entire remainder of the file, don't |
| 1330 | * call it unless you know you're done with the file. |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1331 | */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1332 | PyObject * |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1333 | PyMarshal_ReadLastObjectFromFile(FILE *fp) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1334 | { |
Antoine Pitrou | 5bc7ec9 | 2010-04-21 22:56:22 +0000 | [diff] [blame] | 1335 | /* REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. */ |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1336 | #define REASONABLE_FILE_LIMIT (1L << 18) |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1337 | #ifdef HAVE_FSTAT |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1338 | off_t filesize; |
| 1339 | filesize = getfilesize(fp); |
| 1340 | if (filesize > 0 && filesize <= REASONABLE_FILE_LIMIT) { |
| 1341 | char* pBuf = (char *)PyMem_MALLOC(filesize); |
| 1342 | if (pBuf != NULL) { |
Serhiy Storchaka | 7e01911 | 2013-02-13 12:08:15 +0200 | [diff] [blame] | 1343 | size_t n = fread(pBuf, 1, (size_t)filesize, fp); |
| 1344 | PyObject* v = PyMarshal_ReadObjectFromString(pBuf, n); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1345 | PyMem_FREE(pBuf); |
| 1346 | return v; |
| 1347 | } |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1348 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1349 | } |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1350 | #endif |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1351 | /* We don't have fstat, or we do but the file is larger than |
| 1352 | * REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time. |
| 1353 | */ |
| 1354 | return PyMarshal_ReadObjectFromFile(fp); |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1355 | |
Tim Peters | 691e0e9 | 2001-01-18 04:39:16 +0000 | [diff] [blame] | 1356 | #undef REASONABLE_FILE_LIMIT |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1357 | } |
| 1358 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1359 | PyObject * |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1360 | PyMarshal_ReadObjectFromFile(FILE *fp) |
| 1361 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1362 | RFILE rf; |
| 1363 | PyObject *result; |
| 1364 | rf.fp = fp; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1365 | rf.readable = NULL; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1366 | rf.current_filename = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1367 | rf.depth = 0; |
| 1368 | rf.ptr = rf.end = NULL; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1369 | rf.refs = PyList_New(0); |
| 1370 | if (rf.refs == NULL) |
| 1371 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1372 | result = r_object(&rf); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1373 | Py_DECREF(rf.refs); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1374 | return result; |
Tim Peters | d9b9ac8 | 2001-01-28 00:27:39 +0000 | [diff] [blame] | 1375 | } |
| 1376 | |
| 1377 | PyObject * |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1378 | PyMarshal_ReadObjectFromString(char *str, Py_ssize_t len) |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1379 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1380 | RFILE rf; |
| 1381 | PyObject *result; |
| 1382 | rf.fp = NULL; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1383 | rf.readable = NULL; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1384 | rf.current_filename = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1385 | rf.ptr = str; |
| 1386 | rf.end = str + len; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1387 | rf.depth = 0; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1388 | rf.refs = PyList_New(0); |
| 1389 | if (rf.refs == NULL) |
| 1390 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1391 | result = r_object(&rf); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1392 | Py_DECREF(rf.refs); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1393 | return result; |
Guido van Rossum | f56e3db | 1993-04-01 20:59:32 +0000 | [diff] [blame] | 1394 | } |
| 1395 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1396 | PyObject * |
Martin v. Löwis | ef82d2f | 2004-06-27 16:51:46 +0000 | [diff] [blame] | 1397 | PyMarshal_WriteObjectToString(PyObject *x, int version) |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1398 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1399 | WFILE wf; |
Guido van Rossum | e6d3904 | 2007-05-09 00:01:30 +0000 | [diff] [blame] | 1400 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1401 | wf.fp = NULL; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1402 | wf.readable = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1403 | wf.str = PyBytes_FromStringAndSize((char *)NULL, 50); |
| 1404 | if (wf.str == NULL) |
| 1405 | return NULL; |
| 1406 | wf.ptr = PyBytes_AS_STRING((PyBytesObject *)wf.str); |
| 1407 | wf.end = wf.ptr + PyBytes_Size(wf.str); |
| 1408 | wf.error = WFERR_OK; |
| 1409 | wf.depth = 0; |
| 1410 | wf.version = version; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1411 | if (version >= 3) { |
| 1412 | if ((wf.refs = PyDict_New()) == NULL) |
| 1413 | return NULL; |
| 1414 | } else |
| 1415 | wf.refs = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1416 | w_object(x, &wf); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1417 | Py_XDECREF(wf.refs); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1418 | if (wf.str != NULL) { |
| 1419 | char *base = PyBytes_AS_STRING((PyBytesObject *)wf.str); |
| 1420 | if (wf.ptr - base > PY_SSIZE_T_MAX) { |
| 1421 | Py_DECREF(wf.str); |
| 1422 | PyErr_SetString(PyExc_OverflowError, |
| 1423 | "too much marshal data for a string"); |
| 1424 | return NULL; |
| 1425 | } |
| 1426 | if (_PyBytes_Resize(&wf.str, (Py_ssize_t)(wf.ptr - base)) < 0) |
| 1427 | return NULL; |
| 1428 | } |
| 1429 | if (wf.error != WFERR_OK) { |
| 1430 | Py_XDECREF(wf.str); |
| 1431 | if (wf.error == WFERR_NOMEMORY) |
| 1432 | PyErr_NoMemory(); |
| 1433 | else |
| 1434 | PyErr_SetString(PyExc_ValueError, |
| 1435 | (wf.error==WFERR_UNMARSHALLABLE)?"unmarshallable object" |
| 1436 | :"object too deeply nested to marshal"); |
| 1437 | return NULL; |
| 1438 | } |
Antoine Pitrou | 1c13f84 | 2012-03-02 18:22:23 +0100 | [diff] [blame] | 1439 | return wf.str; |
Guido van Rossum | 3f3bb3d | 1996-08-19 22:07:17 +0000 | [diff] [blame] | 1440 | } |
| 1441 | |
Guido van Rossum | 64b4552 | 1991-06-07 13:58:22 +0000 | [diff] [blame] | 1442 | /* And an interface for Python programs... */ |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1443 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1444 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1445 | marshal_dump(PyObject *self, PyObject *args) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1446 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1447 | /* XXX Quick hack -- need to do this differently */ |
| 1448 | PyObject *x; |
| 1449 | PyObject *f; |
| 1450 | int version = Py_MARSHAL_VERSION; |
| 1451 | PyObject *s; |
| 1452 | PyObject *res; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 1453 | _Py_IDENTIFIER(write); |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 1454 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1455 | if (!PyArg_ParseTuple(args, "OO|i:dump", &x, &f, &version)) |
| 1456 | return NULL; |
| 1457 | s = PyMarshal_WriteObjectToString(x, version); |
| 1458 | if (s == NULL) |
| 1459 | return NULL; |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 1460 | res = _PyObject_CallMethodId(f, &PyId_write, "O", s); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1461 | Py_DECREF(s); |
| 1462 | return res; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1463 | } |
| 1464 | |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1465 | PyDoc_STRVAR(dump_doc, |
| 1466 | "dump(value, file[, version])\n\ |
| 1467 | \n\ |
| 1468 | Write the value on the open file. The value must be a supported type.\n\ |
| 1469 | The file must be an open file object such as sys.stdout or returned by\n\ |
| 1470 | open() or os.popen(). It must be opened in binary mode ('wb' or 'w+b').\n\ |
| 1471 | \n\ |
| 1472 | If the value has (or contains an object that has) an unsupported type, a\n\ |
| 1473 | ValueError exception is raised — but garbage data will also be written\n\ |
| 1474 | to the file. The object will not be properly read back by load()\n\ |
| 1475 | \n\ |
| 1476 | The version argument indicates the data format that dump should use."); |
| 1477 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1478 | static PyObject * |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1479 | marshal_load(PyObject *self, PyObject *f) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1480 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1481 | PyObject *data, *result; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 1482 | _Py_IDENTIFIER(read); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1483 | RFILE rf; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1484 | |
| 1485 | /* |
| 1486 | * Make a call to the read method, but read zero bytes. |
| 1487 | * This is to ensure that the object passed in at least |
| 1488 | * has a read method which returns bytes. |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1489 | * This can be removed if we guarantee good error handling |
| 1490 | * for r_string() |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1491 | */ |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 1492 | data = _PyObject_CallMethodId(f, &PyId_read, "i", 0); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1493 | if (data == NULL) |
| 1494 | return NULL; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1495 | if (!PyBytes_Check(data)) { |
| 1496 | PyErr_Format(PyExc_TypeError, |
| 1497 | "f.read() returned not bytes but %.100s", |
| 1498 | data->ob_type->tp_name); |
| 1499 | result = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1500 | } |
| 1501 | else { |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1502 | rf.depth = 0; |
| 1503 | rf.fp = NULL; |
| 1504 | rf.readable = f; |
Vinay Sajip | aac0f75 | 2011-07-02 18:42:21 +0100 | [diff] [blame] | 1505 | rf.current_filename = NULL; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1506 | if ((rf.refs = PyList_New(0)) != NULL) { |
| 1507 | result = read_object(&rf); |
| 1508 | Py_DECREF(rf.refs); |
| 1509 | } else |
| 1510 | result = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1511 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1512 | Py_DECREF(data); |
| 1513 | return result; |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1514 | } |
| 1515 | |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1516 | PyDoc_STRVAR(load_doc, |
| 1517 | "load(file)\n\ |
| 1518 | \n\ |
| 1519 | Read one value from the open file and return it. If no valid value is\n\ |
| 1520 | read (e.g. because the data has a different Python version’s\n\ |
| 1521 | incompatible marshal format), raise EOFError, ValueError or TypeError.\n\ |
| 1522 | The file must be an open file object opened in binary mode ('rb' or\n\ |
| 1523 | 'r+b').\n\ |
| 1524 | \n\ |
| 1525 | Note: If an object containing an unsupported type was marshalled with\n\ |
| 1526 | dump(), load() will substitute None for the unmarshallable type."); |
| 1527 | |
| 1528 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1529 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1530 | marshal_dumps(PyObject *self, PyObject *args) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1531 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1532 | PyObject *x; |
| 1533 | int version = Py_MARSHAL_VERSION; |
| 1534 | if (!PyArg_ParseTuple(args, "O|i:dumps", &x, &version)) |
| 1535 | return NULL; |
| 1536 | return PyMarshal_WriteObjectToString(x, version); |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1537 | } |
| 1538 | |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1539 | PyDoc_STRVAR(dumps_doc, |
| 1540 | "dumps(value[, version])\n\ |
| 1541 | \n\ |
| 1542 | Return the string that would be written to a file by dump(value, file).\n\ |
| 1543 | The value must be a supported type. Raise a ValueError exception if\n\ |
| 1544 | value has (or contains an object that has) an unsupported type.\n\ |
| 1545 | \n\ |
| 1546 | The version argument indicates the data format that dumps should use."); |
| 1547 | |
| 1548 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1549 | static PyObject * |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1550 | marshal_loads(PyObject *self, PyObject *args) |
Guido van Rossum | 0b0db8e | 1993-01-21 16:07:51 +0000 | [diff] [blame] | 1551 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1552 | RFILE rf; |
| 1553 | Py_buffer p; |
| 1554 | char *s; |
| 1555 | Py_ssize_t n; |
| 1556 | PyObject* result; |
Antoine Pitrou | 4a90ef0 | 2012-03-03 02:35:32 +0100 | [diff] [blame] | 1557 | if (!PyArg_ParseTuple(args, "y*:loads", &p)) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1558 | return NULL; |
| 1559 | s = p.buf; |
| 1560 | n = p.len; |
| 1561 | rf.fp = NULL; |
Vinay Sajip | 5bdae3b | 2011-07-02 16:42:47 +0100 | [diff] [blame] | 1562 | rf.readable = NULL; |
Benjamin Peterson | 43b0686 | 2011-05-27 09:08:01 -0500 | [diff] [blame] | 1563 | rf.current_filename = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1564 | rf.ptr = s; |
| 1565 | rf.end = s + n; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1566 | rf.depth = 0; |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1567 | if ((rf.refs = PyList_New(0)) == NULL) |
| 1568 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1569 | result = read_object(&rf); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1570 | PyBuffer_Release(&p); |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1571 | Py_DECREF(rf.refs); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1572 | return result; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1573 | } |
| 1574 | |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1575 | PyDoc_STRVAR(loads_doc, |
Antoine Pitrou | 4a90ef0 | 2012-03-03 02:35:32 +0100 | [diff] [blame] | 1576 | "loads(bytes)\n\ |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1577 | \n\ |
Antoine Pitrou | 4a90ef0 | 2012-03-03 02:35:32 +0100 | [diff] [blame] | 1578 | Convert the bytes object to a value. If no valid value is found, raise\n\ |
| 1579 | EOFError, ValueError or TypeError. Extra characters in the input are\n\ |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1580 | ignored."); |
| 1581 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 1582 | static PyMethodDef marshal_methods[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1583 | {"dump", marshal_dump, METH_VARARGS, dump_doc}, |
| 1584 | {"load", marshal_load, METH_O, load_doc}, |
| 1585 | {"dumps", marshal_dumps, METH_VARARGS, dumps_doc}, |
| 1586 | {"loads", marshal_loads, METH_VARARGS, loads_doc}, |
| 1587 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1588 | }; |
| 1589 | |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1590 | |
| 1591 | PyDoc_STRVAR(module_doc, |
| 1592 | "This module contains functions that can read and write Python values in\n\ |
| 1593 | a binary format. The format is specific to Python, but independent of\n\ |
| 1594 | machine architecture issues.\n\ |
| 1595 | \n\ |
| 1596 | Not all Python object types are supported; in general, only objects\n\ |
| 1597 | whose value is independent from a particular invocation of Python can be\n\ |
| 1598 | written and read by this module. The following types are supported:\n\ |
| 1599 | None, integers, floating point numbers, strings, bytes, bytearrays,\n\ |
| 1600 | tuples, lists, sets, dictionaries, and code objects, where it\n\ |
| 1601 | should be understood that tuples, lists and dictionaries are only\n\ |
| 1602 | supported as long as the values contained therein are themselves\n\ |
| 1603 | supported; and recursive lists and dictionaries should not be written\n\ |
| 1604 | (they will cause infinite loops).\n\ |
| 1605 | \n\ |
| 1606 | Variables:\n\ |
| 1607 | \n\ |
| 1608 | version -- indicates the format that the module uses. Version 0 is the\n\ |
| 1609 | historical format, version 1 shares interned strings and version 2\n\ |
| 1610 | uses a binary format for floating point numbers.\n\ |
Kristján Valur Jónsson | d7009c6 | 2013-03-19 18:02:10 -0700 | [diff] [blame] | 1611 | Version 3 shares common object references (New in version 3.4).\n\ |
R. David Murray | dd226ea | 2009-05-13 12:27:21 +0000 | [diff] [blame] | 1612 | \n\ |
| 1613 | Functions:\n\ |
| 1614 | \n\ |
| 1615 | dump() -- write value to a file\n\ |
| 1616 | load() -- read value from a file\n\ |
| 1617 | dumps() -- write value to a string\n\ |
| 1618 | loads() -- read value from a string"); |
| 1619 | |
| 1620 | |
| 1621 | |
Brett Cannon | 429ef65 | 2008-06-27 00:35:35 +0000 | [diff] [blame] | 1622 | static struct PyModuleDef marshalmodule = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1623 | PyModuleDef_HEAD_INIT, |
| 1624 | "marshal", |
| 1625 | module_doc, |
| 1626 | 0, |
| 1627 | marshal_methods, |
| 1628 | NULL, |
| 1629 | NULL, |
| 1630 | NULL, |
| 1631 | NULL |
Martin v. Löwis | 1a21451 | 2008-06-11 05:26:20 +0000 | [diff] [blame] | 1632 | }; |
| 1633 | |
Jason Tishler | 6bc06ec | 2003-09-04 11:59:50 +0000 | [diff] [blame] | 1634 | PyMODINIT_FUNC |
Thomas Wouters | f70ef4f | 2000-07-22 18:47:25 +0000 | [diff] [blame] | 1635 | PyMarshal_Init(void) |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1636 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1637 | PyObject *mod = PyModule_Create(&marshalmodule); |
| 1638 | if (mod == NULL) |
| 1639 | return NULL; |
| 1640 | PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION); |
| 1641 | return mod; |
Guido van Rossum | dce2e3d | 1991-06-04 19:42:30 +0000 | [diff] [blame] | 1642 | } |