Chain error messages in more files.

1 files changed, 5 insertions, 5 deletions

diff --git a/stream/obj_parse.c b/stream/obj_parse.c
index 316e8ad4..8f43a064 100644
--- a/stream/obj_parse.c
+++ b/stream/obj_parse.c
@@ -181,7 +181,7 @@ cleanup:
 	if (dict) fz_dropobj(dict);
 	*obj = nil;
 	*sp = s;
-	return error;
+	return error; /* already rethrown */
 }
 
 static fz_error *parsearray(fz_obj **obj, char **sp, struct vap *v)
@@ -462,7 +462,7 @@ static fz_error *parseobj(fz_obj **obj, char **sp, struct vap *v)
 		error = fz_throw("syntax error: unknown byte 0x%d", *s);
 
 	*sp = s;
-	return error;
+	return error; /* already rethrown */
 }
 
 fz_error *
@@ -476,12 +476,12 @@ fz_packobj(fz_obj **op, char *fmt, ...)
 	va_copy(v.ap, ap);
 
 	error = parseobj(op, &fmt, &v);
-	if (error)
-		error = fz_rethrow(error, "cannot parse object");
 
 	va_end(ap);
 
-	return error;
+	if (error)
+		return fz_rethrow(error, "cannot parse object");
+	return nil;
 }
 
 fz_error *