traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Jeremy's patches for more robust handling of unmarshallable types.

This commit is contained in:
Guido van Rossum 1996-06-26 20:41:23 +00:00
parent bbb1e26a67
commit f21506076d
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Python/marshal.c
View File

@ -50,6 +50,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
typedef struct { typedef struct {
FILE *fp; FILE *fp;
int error;
/* If fp == NULL, the following are valid: */ /* If fp == NULL, the following are valid: */
object *str; object *str;
char *ptr; char *ptr;
@ -220,6 +221,7 @@ w_object(v, p)
} }
else { else {
w_byte(TYPE_UNKNOWN, p); w_byte(TYPE_UNKNOWN, p);
p->error = 1;
} }
} }
@ -230,6 +232,7 @@ wr_long(x, fp)
{ {
WFILE wf; WFILE wf;
wf.fp = fp; wf.fp = fp;
wf.error = 0;
w_long(x, &wf); w_long(x, &wf);
} }
@ -240,6 +243,7 @@ wr_object(x, fp)
{ {
WFILE wf; WFILE wf;
wf.fp = fp; wf.fp = fp;
wf.error = 0;
w_object(x, &wf); w_object(x, &wf);
} }
@ -429,10 +433,10 @@ r_object(p)
object *key, *val; object *key, *val;
key = r_object(p); key = r_object(p);
if (key == NULL) if (key == NULL)
break; /* XXXX and how about memory errors? */ break; /* XXX Assume TYPE_NULL, not an error */
val = r_object(p); val = r_object(p);
/* XXXX error check? */ if (val != NULL)
dict2insert(v, key, val); dict2insert(v, key, val);
DECREF(key); DECREF(key);
XDECREF(val); XDECREF(val);
} }
@ -476,8 +480,10 @@ r_object(p)
return v; return v;
default: default:
err_setstr(TypeError, "read unknown object"); /* Bogus data got written, which isn't ideal.
return NULL; This will let you keep working and recover. */
INCREF(None);
return None;
} }
} }
@ -541,7 +547,12 @@ marshal_dump(self, args)
wf.fp = getfilefile(f); wf.fp = getfilefile(f);
wf.str = NULL; wf.str = NULL;
wf.ptr = wf.end = NULL; wf.ptr = wf.end = NULL;
wf.error = 0;
w_object(x, &wf); w_object(x, &wf);
if (wf.error) {
err_setstr(ValueError, "unmarshallable object");
return NULL;
}
INCREF(None); INCREF(None);
return None; return None;
} }
@ -587,10 +598,16 @@ marshal_dumps(self, args)
return NULL; return NULL;
wf.ptr = GETSTRINGVALUE((stringobject *)wf.str); wf.ptr = GETSTRINGVALUE((stringobject *)wf.str);
wf.end = wf.ptr + getstringsize(wf.str); wf.end = wf.ptr + getstringsize(wf.str);
wf.error = 0;
w_object(x, &wf); w_object(x, &wf);
if (wf.str != NULL) if (wf.str != NULL)
resizestring(&wf.str, resizestring(&wf.str,
(int) (wf.ptr - GETSTRINGVALUE((stringobject *)wf.str))); (int) (wf.ptr - GETSTRINGVALUE((stringobject *)wf.str)));
if (wf.error) {
XDECREF(wf.str);
err_setstr(ValueError, "unmarshallable object");
return NULL;
}
return wf.str; return wf.str;
} }