blob: 91d322bb2636dc74246b34e56d26ab7b4ba59c43 [file] [log] [blame]
Guido van Rossumdce2e3d1991-06-04 19:42:30 +00001
2/* Write Python objects to files and read them back.
3 This is intended for writing and reading compiled Python code only;
4 a true persistent storage facility would be much harder, since
5 it would have to take circular links and sharing into account. */
6
Guido van Rossum79f25d91997-04-29 20:08:16 +00007#include "Python.h"
Guido van Rossumdce2e3d1991-06-04 19:42:30 +00008#include "longintrepr.h"
9#include "compile.h"
10#include "marshal.h"
11
Fred Drake6da0b912000-06-28 18:47:56 +000012/* High water mark to determine when the marshalled object is dangerously deep
13 * and risks coring the interpreter. When the object stack gets this deep,
14 * raise an exception instead of continuing.
15 */
16#define MAX_MARSHAL_STACK_DEPTH 5000
17
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000018#define TYPE_NULL '0'
19#define TYPE_NONE 'N'
Guido van Rossume449af71996-10-11 16:25:41 +000020#define TYPE_ELLIPSIS '.'
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000021#define TYPE_INT 'i'
Guido van Rossumb0c168c1996-12-05 23:15:02 +000022#define TYPE_INT64 'I'
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000023#define TYPE_FLOAT 'f'
Guido van Rossum8a5c5d21996-01-12 01:09:56 +000024#define TYPE_COMPLEX 'x'
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000025#define TYPE_LONG 'l'
26#define TYPE_STRING 's'
27#define TYPE_TUPLE '('
28#define TYPE_LIST '['
29#define TYPE_DICT '{'
Guido van Rossum681d79a1995-07-18 14:51:37 +000030#define TYPE_CODE 'c'
Guido van Rossumc279b532000-03-10 23:03:02 +000031#define TYPE_UNICODE 'u'
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000032#define TYPE_UNKNOWN '?'
33
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000034typedef struct {
35 FILE *fp;
Guido van Rossumf2150601996-06-26 20:41:23 +000036 int error;
Fred Drake6da0b912000-06-28 18:47:56 +000037 int depth;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000038 /* If fp == NULL, the following are valid: */
Guido van Rossum79f25d91997-04-29 20:08:16 +000039 PyObject *str;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000040 char *ptr;
41 char *end;
42} WFILE;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000043
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000044#define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \
45 else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
46 else w_more(c, p)
47
48static void
Fredrik Lundh11534382000-07-23 18:24:06 +000049w_more(int c, WFILE *p)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000050{
51 int size, newsize;
52 if (p->str == NULL)
53 return; /* An error already occurred */
Guido van Rossum79f25d91997-04-29 20:08:16 +000054 size = PyString_Size(p->str);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000055 newsize = size + 1024;
Guido van Rossum79f25d91997-04-29 20:08:16 +000056 if (_PyString_Resize(&p->str, newsize) != 0) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000057 p->ptr = p->end = NULL;
58 }
59 else {
Guido van Rossum79f25d91997-04-29 20:08:16 +000060 p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size;
61 p->end =
62 PyString_AS_STRING((PyStringObject *)p->str) + newsize;
Tim Peters8315ea52000-07-23 19:28:35 +000063 *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000064 }
65}
66
67static void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +000068w_string(char *s, int n, WFILE *p)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000069{
70 if (p->fp != NULL) {
71 fwrite(s, 1, n, p->fp);
72 }
73 else {
74 while (--n >= 0) {
75 w_byte(*s, p);
76 s++;
77 }
78 }
79}
80
81static void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +000082w_short(int x, WFILE *p)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000083{
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000084 w_byte( x & 0xff, p);
85 w_byte((x>> 8) & 0xff, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000086}
87
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000088static void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +000089w_long(long x, WFILE *p)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000090{
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000091 w_byte((int)( x & 0xff), p);
92 w_byte((int)((x>> 8) & 0xff), p);
93 w_byte((int)((x>>16) & 0xff), p);
94 w_byte((int)((x>>24) & 0xff), p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +000095}
96
Guido van Rossumc1547d91996-12-10 15:39:04 +000097#if SIZEOF_LONG > 4
Guido van Rossum0b0db8e1993-01-21 16:07:51 +000098static void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +000099w_long64(long x, WFILE *p)
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000100{
101 w_long(x, p);
Guido van Rossumc1547d91996-12-10 15:39:04 +0000102 w_long(x>>32, p);
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000103}
Guido van Rossumc1547d91996-12-10 15:39:04 +0000104#endif
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000105
106static void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000107w_object(PyObject *v, WFILE *p)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000108{
Guido van Rossum3a205f71995-02-17 15:10:07 +0000109 int i, n;
Guido van Rossumd076c731998-10-07 19:42:25 +0000110 PyBufferProcs *pb;
Fred Drake6da0b912000-06-28 18:47:56 +0000111
112 p->depth++;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000113
Fred Drake6da0b912000-06-28 18:47:56 +0000114 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
115 p->error = 2;
116 }
117 else if (v == NULL) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000118 w_byte(TYPE_NULL, p);
Guido van Rossum730806d1998-04-10 22:27:42 +0000119 }
120 else if (v == Py_None) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000121 w_byte(TYPE_NONE, p);
Guido van Rossum730806d1998-04-10 22:27:42 +0000122 }
123 else if (v == Py_Ellipsis) {
124 w_byte(TYPE_ELLIPSIS, p);
125 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000126 else if (PyInt_Check(v)) {
127 long x = PyInt_AS_LONG((PyIntObject *)v);
Guido van Rossumc1547d91996-12-10 15:39:04 +0000128#if SIZEOF_LONG > 4
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000129 long y = x>>31;
130 if (y && y != -1) {
131 w_byte(TYPE_INT64, p);
132 w_long64(x, p);
133 }
Guido van Rossumc1547d91996-12-10 15:39:04 +0000134 else
135#endif
136 {
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000137 w_byte(TYPE_INT, p);
138 w_long(x, p);
139 }
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000140 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000141 else if (PyLong_Check(v)) {
142 PyLongObject *ob = (PyLongObject *)v;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000143 w_byte(TYPE_LONG, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000144 n = ob->ob_size;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000145 w_long((long)n, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000146 if (n < 0)
147 n = -n;
148 for (i = 0; i < n; i++)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000149 w_short(ob->ob_digit[i], p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000150 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000151 else if (PyFloat_Check(v)) {
Tim Petersdbd9ba62000-07-09 03:09:57 +0000152 extern void PyFloat_AsString(char *, PyFloatObject *);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000153 char buf[256]; /* Plenty to format any double */
Guido van Rossum79f25d91997-04-29 20:08:16 +0000154 PyFloat_AsString(buf, (PyFloatObject *)v);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000155 n = strlen(buf);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000156 w_byte(TYPE_FLOAT, p);
Guido van Rossum3a205f71995-02-17 15:10:07 +0000157 w_byte(n, p);
158 w_string(buf, n, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000159 }
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000160#ifndef WITHOUT_COMPLEX
Guido van Rossum79f25d91997-04-29 20:08:16 +0000161 else if (PyComplex_Check(v)) {
Tim Petersdbd9ba62000-07-09 03:09:57 +0000162 extern void PyFloat_AsString(char *, PyFloatObject *);
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000163 char buf[256]; /* Plenty to format any double */
Guido van Rossum79f25d91997-04-29 20:08:16 +0000164 PyFloatObject *temp;
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000165 w_byte(TYPE_COMPLEX, p);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000166 temp = (PyFloatObject*)PyFloat_FromDouble(
167 PyComplex_RealAsDouble(v));
168 PyFloat_AsString(buf, temp);
169 Py_DECREF(temp);
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000170 n = strlen(buf);
171 w_byte(n, p);
172 w_string(buf, n, p);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000173 temp = (PyFloatObject*)PyFloat_FromDouble(
174 PyComplex_ImagAsDouble(v));
175 PyFloat_AsString(buf, temp);
176 Py_DECREF(temp);
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000177 n = strlen(buf);
178 w_byte(n, p);
179 w_string(buf, n, p);
180 }
181#endif
Guido van Rossum79f25d91997-04-29 20:08:16 +0000182 else if (PyString_Check(v)) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000183 w_byte(TYPE_STRING, p);
Guido van Rossumc279b532000-03-10 23:03:02 +0000184 n = PyString_GET_SIZE(v);
Guido van Rossum3a205f71995-02-17 15:10:07 +0000185 w_long((long)n, p);
Guido van Rossumc279b532000-03-10 23:03:02 +0000186 w_string(PyString_AS_STRING(v), n, p);
187 }
188 else if (PyUnicode_Check(v)) {
189 PyObject *utf8;
190 utf8 = PyUnicode_AsUTF8String(v);
191 if (utf8 == NULL) {
Guido van Rossum98626cd2000-06-28 23:24:19 +0000192 p->depth--;
193 p->error = 1;
194 return;
Guido van Rossumc279b532000-03-10 23:03:02 +0000195 }
196 w_byte(TYPE_UNICODE, p);
197 n = PyString_GET_SIZE(utf8);
198 w_long((long)n, p);
199 w_string(PyString_AS_STRING(utf8), n, p);
200 Py_DECREF(utf8);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000201 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000202 else if (PyTuple_Check(v)) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000203 w_byte(TYPE_TUPLE, p);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000204 n = PyTuple_Size(v);
Guido van Rossum3a205f71995-02-17 15:10:07 +0000205 w_long((long)n, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000206 for (i = 0; i < n; i++) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000207 w_object(PyTuple_GET_ITEM(v, i), p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000208 }
209 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000210 else if (PyList_Check(v)) {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000211 w_byte(TYPE_LIST, p);
Guido van Rossumc279b532000-03-10 23:03:02 +0000212 n = PyList_GET_SIZE(v);
Guido van Rossum3a205f71995-02-17 15:10:07 +0000213 w_long((long)n, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000214 for (i = 0; i < n; i++) {
Guido van Rossumc279b532000-03-10 23:03:02 +0000215 w_object(PyList_GET_ITEM(v, i), p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000216 }
217 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000218 else if (PyDict_Check(v)) {
Guido van Rossum25831651993-05-19 14:50:45 +0000219 int pos;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000220 PyObject *key, *value;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000221 w_byte(TYPE_DICT, p);
Guido van Rossum64b45521991-06-07 13:58:22 +0000222 /* This one is NULL object terminated! */
Guido van Rossum25831651993-05-19 14:50:45 +0000223 pos = 0;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000224 while (PyDict_Next(v, &pos, &key, &value)) {
Guido van Rossum25831651993-05-19 14:50:45 +0000225 w_object(key, p);
226 w_object(value, p);
Guido van Rossum64b45521991-06-07 13:58:22 +0000227 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000228 w_object((PyObject *)NULL, p);
Guido van Rossum64b45521991-06-07 13:58:22 +0000229 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000230 else if (PyCode_Check(v)) {
231 PyCodeObject *co = (PyCodeObject *)v;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000232 w_byte(TYPE_CODE, p);
Guido van Rossum681d79a1995-07-18 14:51:37 +0000233 w_short(co->co_argcount, p);
234 w_short(co->co_nlocals, p);
Guido van Rossum98a9b311997-01-17 21:07:08 +0000235 w_short(co->co_stacksize, p);
Guido van Rossum681d79a1995-07-18 14:51:37 +0000236 w_short(co->co_flags, p);
Guido van Rossumd076c731998-10-07 19:42:25 +0000237 w_object(co->co_code, p);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000238 w_object(co->co_consts, p);
239 w_object(co->co_names, p);
Guido van Rossum681d79a1995-07-18 14:51:37 +0000240 w_object(co->co_varnames, p);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000241 w_object(co->co_filename, p);
Guido van Rossum9bfef441993-03-29 10:43:31 +0000242 w_object(co->co_name, p);
Guido van Rossumd031c891997-01-24 03:44:17 +0000243 w_short(co->co_firstlineno, p);
244 w_object(co->co_lnotab, p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000245 }
Guido van Rossumd076c731998-10-07 19:42:25 +0000246 else if ((pb = v->ob_type->tp_as_buffer) != NULL &&
247 pb->bf_getsegcount != NULL &&
248 pb->bf_getreadbuffer != NULL &&
249 (*pb->bf_getsegcount)(v, NULL) == 1)
250 {
251 /* Write unknown buffer-style objects as a string */
252 char *s;
253 w_byte(TYPE_STRING, p);
254 n = (*pb->bf_getreadbuffer)(v, 0, (void **)&s);
255 w_long((long)n, p);
256 w_string(s, n, p);
257 }
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000258 else {
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000259 w_byte(TYPE_UNKNOWN, p);
Guido van Rossumf2150601996-06-26 20:41:23 +0000260 p->error = 1;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000261 }
Guido van Rossum98626cd2000-06-28 23:24:19 +0000262
263 p->depth--;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000264}
265
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000266void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000267PyMarshal_WriteLongToFile(long x, FILE *fp)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000268{
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000269 WFILE wf;
270 wf.fp = fp;
Guido van Rossumf2150601996-06-26 20:41:23 +0000271 wf.error = 0;
Fred Drake6da0b912000-06-28 18:47:56 +0000272 wf.depth = 0;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000273 w_long(x, &wf);
274}
275
276void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000277PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000278{
279 WFILE wf;
280 wf.fp = fp;
Guido van Rossumf2150601996-06-26 20:41:23 +0000281 wf.error = 0;
Guido van Rossum98626cd2000-06-28 23:24:19 +0000282 wf.depth = 0;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000283 w_object(x, &wf);
284}
285
286typedef WFILE RFILE; /* Same struct with different invariants */
287
Guido van Rossum8d617a61995-03-09 12:12:11 +0000288#define rs_byte(p) (((p)->ptr != (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
289
290#define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p))
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000291
292static int
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000293r_string(char *s, int n, RFILE *p)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000294{
295 if (p->fp != NULL)
296 return fread(s, 1, n, p->fp);
297 if (p->end - p->ptr < n)
298 n = p->end - p->ptr;
299 memcpy(s, p->ptr, n);
300 p->ptr += n;
301 return n;
302}
303
304static int
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000305r_short(RFILE *p)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000306{
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000307 register short x;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000308 x = r_byte(p);
309 x |= r_byte(p) << 8;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000310 /* XXX If your short is > 16 bits, add sign-extension here!!! */
311 return x;
312}
313
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000314static long
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000315r_long(RFILE *p)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000316{
317 register long x;
Guido van Rossum8d617a61995-03-09 12:12:11 +0000318 register FILE *fp = p->fp;
319 if (fp) {
320 x = getc(fp);
321 x |= (long)getc(fp) << 8;
322 x |= (long)getc(fp) << 16;
323 x |= (long)getc(fp) << 24;
324 }
325 else {
326 x = rs_byte(p);
327 x |= (long)rs_byte(p) << 8;
328 x |= (long)rs_byte(p) << 16;
329 x |= (long)rs_byte(p) << 24;
330 }
Guido van Rossumc1547d91996-12-10 15:39:04 +0000331#if SIZEOF_LONG > 4
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000332 /* Sign extension for 64-bit machines */
333 x <<= (8*sizeof(long) - 32);
334 x >>= (8*sizeof(long) - 32);
Guido van Rossumc1547d91996-12-10 15:39:04 +0000335#endif
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000336 return x;
337}
338
339static long
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000340r_long64(RFILE *p)
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000341{
342 register long x;
Guido van Rossumc1547d91996-12-10 15:39:04 +0000343 x = r_long(p);
344#if SIZEOF_LONG > 4
345 x = (x & 0xFFFFFFFF) | (r_long(p) << 32);
346#else
347 if (r_long(p) != 0) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000348 PyObject *f = PySys_GetObject("stderr");
Guido van Rossumc1547d91996-12-10 15:39:04 +0000349 if (f != NULL)
Guido van Rossum7e8d26d1997-05-22 22:35:47 +0000350 (void) PyFile_WriteString(
Guido van Rossumc1547d91996-12-10 15:39:04 +0000351 "Warning: un-marshal 64-bit int in 32-bit mode\n",
352 f);
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000353 }
Guido van Rossumc1547d91996-12-10 15:39:04 +0000354#endif
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000355 return x;
356}
357
Guido van Rossum79f25d91997-04-29 20:08:16 +0000358static PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000359r_object(RFILE *p)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000360{
Guido van Rossum79f25d91997-04-29 20:08:16 +0000361 PyObject *v, *v2;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000362 long i, n;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000363 int type = r_byte(p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000364
365 switch (type) {
366
367 case EOF:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000368 PyErr_SetString(PyExc_EOFError,
369 "EOF read where object expected");
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000370 return NULL;
371
372 case TYPE_NULL:
373 return NULL;
374
375 case TYPE_NONE:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000376 Py_INCREF(Py_None);
377 return Py_None;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000378
Guido van Rossume449af71996-10-11 16:25:41 +0000379 case TYPE_ELLIPSIS:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000380 Py_INCREF(Py_Ellipsis);
Guido van Rossume449af71996-10-11 16:25:41 +0000381 return Py_Ellipsis;
Guido van Rossum8861b741996-07-30 16:49:37 +0000382
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000383 case TYPE_INT:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000384 return PyInt_FromLong(r_long(p));
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000385
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000386 case TYPE_INT64:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000387 return PyInt_FromLong(r_long64(p));
Guido van Rossumb0c168c1996-12-05 23:15:02 +0000388
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000389 case TYPE_LONG:
390 {
391 int size;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000392 PyLongObject *ob;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000393 n = r_long(p);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000394 size = n<0 ? -n : n;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000395 ob = _PyLong_New(size);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000396 if (ob == NULL)
397 return NULL;
398 ob->ob_size = n;
399 for (i = 0; i < size; i++)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000400 ob->ob_digit[i] = r_short(p);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000401 return (PyObject *)ob;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000402 }
403
404 case TYPE_FLOAT:
405 {
Tim Petersdbd9ba62000-07-09 03:09:57 +0000406 extern double atof(const char *);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000407 char buf[256];
Guido van Rossum0ae748d1997-02-14 22:58:07 +0000408 double dx;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000409 n = r_byte(p);
410 if (r_string(buf, (int)n, p) != n) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000411 PyErr_SetString(PyExc_EOFError,
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000412 "EOF read where object expected");
413 return NULL;
414 }
415 buf[n] = '\0';
Guido van Rossum0ae748d1997-02-14 22:58:07 +0000416 PyFPE_START_PROTECT("atof", return 0)
417 dx = atof(buf);
Guido van Rossum45b83911997-03-14 04:32:50 +0000418 PyFPE_END_PROTECT(dx)
Guido van Rossum79f25d91997-04-29 20:08:16 +0000419 return PyFloat_FromDouble(dx);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000420 }
421
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000422#ifndef WITHOUT_COMPLEX
423 case TYPE_COMPLEX:
424 {
Tim Petersdbd9ba62000-07-09 03:09:57 +0000425 extern double atof(const char *);
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000426 char buf[256];
Guido van Rossum530956d1996-07-21 02:27:43 +0000427 Py_complex c;
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000428 n = r_byte(p);
429 if (r_string(buf, (int)n, p) != n) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000430 PyErr_SetString(PyExc_EOFError,
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000431 "EOF read where object expected");
432 return NULL;
433 }
434 buf[n] = '\0';
Guido van Rossum0ae748d1997-02-14 22:58:07 +0000435 PyFPE_START_PROTECT("atof", return 0)
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000436 c.real = atof(buf);
Guido van Rossum45b83911997-03-14 04:32:50 +0000437 PyFPE_END_PROTECT(c)
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000438 n = r_byte(p);
439 if (r_string(buf, (int)n, p) != n) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000440 PyErr_SetString(PyExc_EOFError,
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000441 "EOF read where object expected");
442 return NULL;
443 }
444 buf[n] = '\0';
Guido van Rossum0ae748d1997-02-14 22:58:07 +0000445 PyFPE_START_PROTECT("atof", return 0)
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000446 c.imag = atof(buf);
Guido van Rossum45b83911997-03-14 04:32:50 +0000447 PyFPE_END_PROTECT(c)
Guido van Rossum79f25d91997-04-29 20:08:16 +0000448 return PyComplex_FromCComplex(c);
Guido van Rossum8a5c5d21996-01-12 01:09:56 +0000449 }
450#endif
451
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000452 case TYPE_STRING:
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000453 n = r_long(p);
Guido van Rossuma45cb451998-06-08 20:27:29 +0000454 if (n < 0) {
455 PyErr_SetString(PyExc_ValueError, "bad marshal data");
456 return NULL;
457 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000458 v = PyString_FromStringAndSize((char *)NULL, n);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000459 if (v != NULL) {
Guido van Rossumc279b532000-03-10 23:03:02 +0000460 if (r_string(PyString_AS_STRING(v), (int)n, p) != n) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000461 Py_DECREF(v);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000462 v = NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000463 PyErr_SetString(PyExc_EOFError,
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000464 "EOF read where object expected");
465 }
466 }
467 return v;
468
Guido van Rossumc279b532000-03-10 23:03:02 +0000469 case TYPE_UNICODE:
470 {
471 char *buffer;
472
473 n = r_long(p);
474 if (n < 0) {
475 PyErr_SetString(PyExc_ValueError, "bad marshal data");
476 return NULL;
477 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000478 buffer = PyMem_NEW(char, n);
Guido van Rossumc279b532000-03-10 23:03:02 +0000479 if (buffer == NULL)
Guido van Rossumb18618d2000-05-03 23:44:39 +0000480 return PyErr_NoMemory();
Guido van Rossumc279b532000-03-10 23:03:02 +0000481 if (r_string(buffer, (int)n, p) != n) {
Guido van Rossumb18618d2000-05-03 23:44:39 +0000482 PyMem_DEL(buffer);
Guido van Rossumc279b532000-03-10 23:03:02 +0000483 PyErr_SetString(PyExc_EOFError,
484 "EOF read where object expected");
485 return NULL;
486 }
487 v = PyUnicode_DecodeUTF8(buffer, n, NULL);
Guido van Rossumb18618d2000-05-03 23:44:39 +0000488 PyMem_DEL(buffer);
Guido van Rossumc279b532000-03-10 23:03:02 +0000489 return v;
490 }
491
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000492 case TYPE_TUPLE:
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000493 n = r_long(p);
Guido van Rossuma45cb451998-06-08 20:27:29 +0000494 if (n < 0) {
495 PyErr_SetString(PyExc_ValueError, "bad marshal data");
496 return NULL;
497 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000498 v = PyTuple_New((int)n);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000499 if (v == NULL)
500 return v;
Jack Jansen9513f2c1995-10-27 13:21:28 +0000501 for (i = 0; i < n; i++) {
502 v2 = r_object(p);
503 if ( v2 == NULL ) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000504 Py_DECREF(v);
Jack Jansen9513f2c1995-10-27 13:21:28 +0000505 v = NULL;
506 break;
507 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000508 PyTuple_SET_ITEM(v, (int)i, v2);
Jack Jansen9513f2c1995-10-27 13:21:28 +0000509 }
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000510 return v;
511
512 case TYPE_LIST:
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000513 n = r_long(p);
Guido van Rossuma45cb451998-06-08 20:27:29 +0000514 if (n < 0) {
515 PyErr_SetString(PyExc_ValueError, "bad marshal data");
516 return NULL;
517 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000518 v = PyList_New((int)n);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000519 if (v == NULL)
520 return v;
Jack Jansen9513f2c1995-10-27 13:21:28 +0000521 for (i = 0; i < n; i++) {
522 v2 = r_object(p);
523 if ( v2 == NULL ) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000524 Py_DECREF(v);
Jack Jansen9513f2c1995-10-27 13:21:28 +0000525 v = NULL;
526 break;
527 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000528 PyList_SetItem(v, (int)i, v2);
Jack Jansen9513f2c1995-10-27 13:21:28 +0000529 }
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000530 return v;
531
Guido van Rossum64b45521991-06-07 13:58:22 +0000532 case TYPE_DICT:
Guido van Rossum79f25d91997-04-29 20:08:16 +0000533 v = PyDict_New();
Guido van Rossum64b45521991-06-07 13:58:22 +0000534 if (v == NULL)
535 return NULL;
536 for (;;) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000537 PyObject *key, *val;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000538 key = r_object(p);
Guido van Rossum64b45521991-06-07 13:58:22 +0000539 if (key == NULL)
Guido van Rossumf2150601996-06-26 20:41:23 +0000540 break; /* XXX Assume TYPE_NULL, not an error */
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000541 val = r_object(p);
Guido van Rossumf2150601996-06-26 20:41:23 +0000542 if (val != NULL)
Guido van Rossum79f25d91997-04-29 20:08:16 +0000543 PyDict_SetItem(v, key, val);
544 Py_DECREF(key);
545 Py_XDECREF(val);
Guido van Rossum64b45521991-06-07 13:58:22 +0000546 }
547 return v;
548
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000549 case TYPE_CODE:
550 {
Guido van Rossum681d79a1995-07-18 14:51:37 +0000551 int argcount = r_short(p);
552 int nlocals = r_short(p);
Guido van Rossum98a9b311997-01-17 21:07:08 +0000553 int stacksize = r_short(p);
Guido van Rossum681d79a1995-07-18 14:51:37 +0000554 int flags = r_short(p);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000555 PyObject *code = NULL;
556 PyObject *consts = NULL;
557 PyObject *names = NULL;
558 PyObject *varnames = NULL;
559 PyObject *filename = NULL;
560 PyObject *name = NULL;
Guido van Rossum0f4bbd21997-02-14 21:12:56 +0000561 int firstlineno = 0;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000562 PyObject *lnotab = NULL;
Jack Jansen9513f2c1995-10-27 13:21:28 +0000563
564 code = r_object(p);
565 if (code) consts = r_object(p);
566 if (consts) names = r_object(p);
567 if (names) varnames = r_object(p);
568 if (varnames) filename = r_object(p);
569 if (filename) name = r_object(p);
Guido van Rossumd031c891997-01-24 03:44:17 +0000570 if (name) {
571 firstlineno = r_short(p);
572 lnotab = r_object(p);
573 }
Jack Jansen9513f2c1995-10-27 13:21:28 +0000574
Guido van Rossum79f25d91997-04-29 20:08:16 +0000575 if (!PyErr_Occurred()) {
576 v = (PyObject *) PyCode_New(
Guido van Rossum98a9b311997-01-17 21:07:08 +0000577 argcount, nlocals, stacksize, flags,
Guido van Rossum681d79a1995-07-18 14:51:37 +0000578 code, consts, names, varnames,
Guido van Rossumd031c891997-01-24 03:44:17 +0000579 filename, name, firstlineno, lnotab);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000580 }
581 else
582 v = NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000583 Py_XDECREF(code);
584 Py_XDECREF(consts);
585 Py_XDECREF(names);
586 Py_XDECREF(varnames);
587 Py_XDECREF(filename);
588 Py_XDECREF(name);
Guido van Rossum6fc06e71997-07-26 23:30:18 +0000589 Py_XDECREF(lnotab);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000590
591 }
592 return v;
593
594 default:
Guido van Rossumf2150601996-06-26 20:41:23 +0000595 /* Bogus data got written, which isn't ideal.
596 This will let you keep working and recover. */
Guido van Rossuma45cb451998-06-08 20:27:29 +0000597 PyErr_SetString(PyExc_ValueError, "bad marshal data");
598 return NULL;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000599
600 }
601}
602
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000603long
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000604PyMarshal_ReadLongFromFile(FILE *fp)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000605{
606 RFILE rf;
607 rf.fp = fp;
608 return r_long(&rf);
609}
610
Guido van Rossum79f25d91997-04-29 20:08:16 +0000611PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000612PyMarshal_ReadObjectFromFile(FILE *fp)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000613{
614 RFILE rf;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000615 if (PyErr_Occurred()) {
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000616 fprintf(stderr, "XXX rd_object called with exception set\n");
617 return NULL;
618 }
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000619 rf.fp = fp;
620 return r_object(&rf);
621}
622
Guido van Rossum79f25d91997-04-29 20:08:16 +0000623PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000624PyMarshal_ReadObjectFromString(char *str, int len)
Guido van Rossumf56e3db1993-04-01 20:59:32 +0000625{
626 RFILE rf;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000627 if (PyErr_Occurred()) {
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000628 fprintf(stderr, "XXX rds_object called with exception set\n");
629 return NULL;
630 }
Guido van Rossumf56e3db1993-04-01 20:59:32 +0000631 rf.fp = NULL;
632 rf.str = NULL;
633 rf.ptr = str;
634 rf.end = str + len;
635 return r_object(&rf);
636}
637
Guido van Rossum79f25d91997-04-29 20:08:16 +0000638PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000639PyMarshal_WriteObjectToString(PyObject *x) /* wrs_object() */
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000640{
641 WFILE wf;
642 wf.fp = NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000643 wf.str = PyString_FromStringAndSize((char *)NULL, 50);
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000644 if (wf.str == NULL)
645 return NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000646 wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str);
647 wf.end = wf.ptr + PyString_Size(wf.str);
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000648 wf.error = 0;
Fred Drake6da0b912000-06-28 18:47:56 +0000649 wf.depth = 0;
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000650 w_object(x, &wf);
651 if (wf.str != NULL)
Guido van Rossum79f25d91997-04-29 20:08:16 +0000652 _PyString_Resize(&wf.str,
653 (int) (wf.ptr -
654 PyString_AS_STRING((PyStringObject *)wf.str)));
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000655 if (wf.error) {
Guido van Rossum79f25d91997-04-29 20:08:16 +0000656 Py_XDECREF(wf.str);
Fred Drake6da0b912000-06-28 18:47:56 +0000657 PyErr_SetString(PyExc_ValueError,
658 (wf.error==1)?"unmarshallable object"
659 :"object too deeply nested to marshal");
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000660 return NULL;
661 }
662 return wf.str;
663}
664
Guido van Rossum64b45521991-06-07 13:58:22 +0000665/* And an interface for Python programs... */
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000666
Guido van Rossum79f25d91997-04-29 20:08:16 +0000667static PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000668marshal_dump(PyObject *self, PyObject *args)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000669{
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000670 WFILE wf;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000671 PyObject *x;
672 PyObject *f;
Guido van Rossum2efa3692000-03-31 00:37:41 +0000673 if (!PyArg_ParseTuple(args, "OO:dump", &x, &f))
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000674 return NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000675 if (!PyFile_Check(f)) {
676 PyErr_SetString(PyExc_TypeError,
677 "marshal.dump() 2nd arg must be file");
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000678 return NULL;
679 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000680 wf.fp = PyFile_AsFile(f);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000681 wf.str = NULL;
682 wf.ptr = wf.end = NULL;
Guido van Rossumf2150601996-06-26 20:41:23 +0000683 wf.error = 0;
Fred Drake6da0b912000-06-28 18:47:56 +0000684 wf.depth = 0;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000685 w_object(x, &wf);
Guido van Rossumf2150601996-06-26 20:41:23 +0000686 if (wf.error) {
Fred Drake6da0b912000-06-28 18:47:56 +0000687 PyErr_SetString(PyExc_ValueError,
688 (wf.error==1)?"unmarshallable object"
689 :"object too deeply nested to marshal");
Guido van Rossumf2150601996-06-26 20:41:23 +0000690 return NULL;
691 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000692 Py_INCREF(Py_None);
693 return Py_None;
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000694}
695
Guido van Rossum79f25d91997-04-29 20:08:16 +0000696static PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000697marshal_load(PyObject *self, PyObject *args)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000698{
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000699 RFILE rf;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000700 PyObject *f;
701 PyObject *v;
Guido van Rossum2efa3692000-03-31 00:37:41 +0000702 if (!PyArg_ParseTuple(args, "O:load", &f))
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000703 return NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000704 if (!PyFile_Check(f)) {
705 PyErr_SetString(PyExc_TypeError,
706 "marshal.load() arg must be file");
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000707 return NULL;
708 }
Guido van Rossum79f25d91997-04-29 20:08:16 +0000709 rf.fp = PyFile_AsFile(f);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000710 rf.str = NULL;
711 rf.ptr = rf.end = NULL;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000712 PyErr_Clear();
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000713 v = r_object(&rf);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000714 if (PyErr_Occurred()) {
715 Py_XDECREF(v);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000716 v = NULL;
717 }
718 return v;
719}
720
Guido van Rossum79f25d91997-04-29 20:08:16 +0000721static PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000722marshal_dumps(PyObject *self, PyObject *args)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000723{
Guido van Rossum79f25d91997-04-29 20:08:16 +0000724 PyObject *x;
Guido van Rossum2efa3692000-03-31 00:37:41 +0000725 if (!PyArg_ParseTuple(args, "O:dumps", &x))
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000726 return NULL;
Guido van Rossum3f3bb3d1996-08-19 22:07:17 +0000727 return PyMarshal_WriteObjectToString(x);
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000728}
729
Guido van Rossum79f25d91997-04-29 20:08:16 +0000730static PyObject *
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000731marshal_loads(PyObject *self, PyObject *args)
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000732{
733 RFILE rf;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000734 PyObject *v;
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000735 char *s;
736 int n;
Guido van Rossum2efa3692000-03-31 00:37:41 +0000737 if (!PyArg_ParseTuple(args, "s#:loads", &s, &n))
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000738 return NULL;
739 rf.fp = NULL;
740 rf.str = args;
741 rf.ptr = s;
742 rf.end = s + n;
Guido van Rossum79f25d91997-04-29 20:08:16 +0000743 PyErr_Clear();
Guido van Rossum0b0db8e1993-01-21 16:07:51 +0000744 v = r_object(&rf);
Guido van Rossum79f25d91997-04-29 20:08:16 +0000745 if (PyErr_Occurred()) {
746 Py_XDECREF(v);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000747 v = NULL;
748 }
749 return v;
750}
751
Guido van Rossum79f25d91997-04-29 20:08:16 +0000752static PyMethodDef marshal_methods[] = {
Guido van Rossum2efa3692000-03-31 00:37:41 +0000753 {"dump", marshal_dump, 1},
754 {"load", marshal_load, 1},
755 {"dumps", marshal_dumps, 1},
756 {"loads", marshal_loads, 1},
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000757 {NULL, NULL} /* sentinel */
758};
759
760void
Thomas Woutersf70ef4f2000-07-22 18:47:25 +0000761PyMarshal_Init(void)
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000762{
Guido van Rossum79f25d91997-04-29 20:08:16 +0000763 (void) Py_InitModule("marshal", marshal_methods);
Guido van Rossumdce2e3d1991-06-04 19:42:30 +0000764}