Commit a6b158cc8110b488f51e265bea16ed17a0079e0a
2018-02-11T19:15:55
don't read plain objects to memory during unpack
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/lib/pack.c b/lib/pack.c
index b00eb49..695e3dc 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -836,12 +836,31 @@ dump_delta_chain(struct got_delta_chain *deltas, FILE *outfile)
goto done;
}
+ if (n == 0) {
+ /* Plain object types are the delta base. */
+ if (delta->type != GOT_OBJ_TYPE_COMMIT &&
+ delta->type != GOT_OBJ_TYPE_TREE &&
+ delta->type != GOT_OBJ_TYPE_BLOB &&
+ delta->type != GOT_OBJ_TYPE_TAG) {
+ err = got_error(GOT_ERR_BAD_DELTA_CHAIN);
+ goto done;
+ }
+
+ err = got_inflate_to_file(&delta_len, delta_file,
+ base_file);
+ fclose(delta_file);
+ if (err)
+ goto done;
+ n++;
+ rewind(base_file);
+ continue;
+ }
+
/* Delta streams should always fit in memory. */
err = got_inflate_to_mem(&delta_buf, &delta_len, delta_file);
- if (err)
- return err;
-
fclose(delta_file);
+ if (err)
+ goto done;
err = got_delta_apply(base_file, delta_buf, delta_len,
/* Final delta application writes to the output file. */