Mercurial > cpython-lru_cache-weakref

annotate Python/marshal.c @ 85157:e7f6cef7a4cc

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