summaryrefslogtreecommitdiff
path: root/src/patch_parse.c
blob: df2492ee5e6a1147d6597c6788ea0be1744f4346 (plain)
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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
#include "git2/patch.h"
#include "patch.h"
#include "path.h"

#define parse_err(...) \
	( giterr_set(GITERR_PATCH, __VA_ARGS__), -1 )

/* TODO: remove this, just use git_patch */
typedef struct {
	git_patch base;
} git_patch_parsed;

typedef struct {
	const char *content;
	size_t content_len;

	const char *line;
	size_t line_len;
	size_t line_num;

	size_t remain;

	/* TODO: move this into the parse struct? its lifecycle is odd... */
	char *header_new_path;
	char *header_old_path;
} patch_parse_ctx;


static void parse_advance_line(patch_parse_ctx *ctx)
{
	ctx->line += ctx->line_len;
	ctx->remain -= ctx->line_len;
	ctx->line_len = git__linenlen(ctx->line, ctx->remain);
	ctx->line_num++;
}

static void parse_advance_chars(patch_parse_ctx *ctx, size_t char_cnt)
{
	ctx->line += char_cnt;
	ctx->remain -= char_cnt;
	ctx->line_len -= char_cnt;
}

static int parse_advance_expected(
	patch_parse_ctx *ctx,
	const char *expected,
	size_t expected_len)
{
	if (ctx->line_len < expected_len)
		return -1;

	if (memcmp(ctx->line, expected, expected_len) != 0)
		return -1;

	parse_advance_chars(ctx, expected_len);
	return 0;
}

static int parse_advance_ws(patch_parse_ctx *ctx)
{
	int ret = -1;

	while (ctx->line_len > 0 &&
		ctx->line[0] != '\n' &&
		git__isspace(ctx->line[0])) {
		ctx->line++;
		ctx->line_len--;
		ctx->remain--;
		ret = 0;
	}

	return ret;
}

static int parse_advance_nl(patch_parse_ctx *ctx)
{
	if (ctx->line_len != 1 || ctx->line[0] != '\n')
		return -1;

	parse_advance_line(ctx);
	return 0;
}

static int header_path_len(patch_parse_ctx *ctx)
{
	bool inquote = 0;
	bool quoted = (ctx->line_len > 0 && ctx->line[0] == '"');
	size_t len;

	for (len = quoted; len < ctx->line_len; len++) {
		if (!quoted && git__isspace(ctx->line[len]))
			break;
		else if (quoted && !inquote && ctx->line[len] == '"') {
			len++;
			break;
		}

		inquote = (!inquote && ctx->line[len] == '\\');
	}

	return len;
}

static int parse_header_path_buf(git_buf *path, patch_parse_ctx *ctx)
{
	int path_len, error = 0;

	path_len = header_path_len(ctx);

	if ((error = git_buf_put(path, ctx->line, path_len)) < 0)
		goto done;

	parse_advance_chars(ctx, path_len);

	git_buf_rtrim(path);

	if (path->size > 0 && path->ptr[0] == '"')
		error = git_buf_unquote(path);

	if (error < 0)
		goto done;

	git_path_squash_slashes(path);

done:
	return error;
}

static int parse_header_path(char **out, patch_parse_ctx *ctx)
{
	git_buf path = GIT_BUF_INIT;
	int error = parse_header_path_buf(&path, ctx);

	*out = git_buf_detach(&path);

	return error;
}

static int parse_header_git_oldpath(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	return parse_header_path((char **)&patch->base.delta->old_file.path, ctx);
}

static int parse_header_git_newpath(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	return parse_header_path((char **)&patch->base.delta->new_file.path, ctx);
}

static int parse_header_mode(uint16_t *mode, patch_parse_ctx *ctx)
{
	const char *end;
	int32_t m;
	int ret;

	if (ctx->line_len < 1 || !git__isdigit(ctx->line[0]))
		return parse_err("invalid file mode at line %d", ctx->line_num);

	if ((ret = git__strntol32(&m, ctx->line, ctx->line_len, &end, 8)) < 0)
		return ret;

	if (m > UINT16_MAX)
		return -1;

	*mode = (uint16_t)m;

	parse_advance_chars(ctx, (end - ctx->line));

	return ret;
}

static int parse_header_oid(
	git_oid *oid,
	size_t *oid_len,
	patch_parse_ctx *ctx)
{
	size_t len;

	for (len = 0; len < ctx->line_len && len < GIT_OID_HEXSZ; len++) {
		if (!git__isxdigit(ctx->line[len]))
			break;
	}

	if (len < GIT_OID_MINPREFIXLEN ||
		git_oid_fromstrn(oid, ctx->line, len) < 0)
		return parse_err("invalid hex formatted object id at line %d",
			ctx->line_num);

	parse_advance_chars(ctx, len);

	*oid_len = len;

	return 0;
}

static int parse_header_git_index(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	if (parse_header_oid(&patch->base.delta->old_file.id,
			&patch->base.delta->old_file.id_abbrev, ctx) < 0 ||
		parse_advance_expected(ctx, "..", 2) < 0 ||
		parse_header_oid(&patch->base.delta->new_file.id,
			&patch->base.delta->new_file.id_abbrev, ctx) < 0)
		return -1;

	if (ctx->line_len > 0 && ctx->line[0] == ' ') {
		uint16_t mode;

		parse_advance_chars(ctx, 1);

		if (parse_header_mode(&mode, ctx) < 0)
			return -1;

		if (!patch->base.delta->new_file.mode)
			patch->base.delta->new_file.mode = mode;

		if (!patch->base.delta->old_file.mode)
			patch->base.delta->old_file.mode = mode;
	}

	return 0;
}

static int parse_header_git_oldmode(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	return parse_header_mode(&patch->base.delta->old_file.mode, ctx);
}

static int parse_header_git_newmode(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	return parse_header_mode(&patch->base.delta->new_file.mode, ctx);
}

static int parse_header_git_deletedfilemode(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	git__free((char *)patch->base.delta->old_file.path);

	patch->base.delta->old_file.path = NULL;
	patch->base.delta->status = GIT_DELTA_DELETED;
	patch->base.delta->nfiles = 1;

	return parse_header_mode(&patch->base.delta->old_file.mode, ctx);
}

static int parse_header_git_newfilemode(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	git__free((char *)patch->base.delta->new_file.path);

	patch->base.delta->new_file.path = NULL;
	patch->base.delta->status = GIT_DELTA_ADDED;
	patch->base.delta->nfiles = 1;

	return parse_header_mode(&patch->base.delta->new_file.mode, ctx);
}

static int parse_header_rename(
	char **out,
	char **header_path,
	patch_parse_ctx *ctx)
{
	git_buf path = GIT_BUF_INIT;
	size_t header_path_len, prefix_len;

	if (*header_path == NULL)
		return parse_err("rename without proper git diff header at line %d",
			ctx->line_num);

	header_path_len = strlen(*header_path);

	if (parse_header_path_buf(&path, ctx) < 0)
		return -1;

	if (header_path_len < git_buf_len(&path))
		return parse_err("rename path is invalid at line %d", ctx->line_num);

	/* This sanity check exists because git core uses the data in the
	* "rename from" / "rename to" lines, but it's formatted differently
	* than the other paths and lacks the normal prefix.  This irregularity
	* causes us to ignore these paths (we always store the prefixed paths)
	* but instead validate that they match the suffix of the paths we parsed
	* since we would behave differently from git core if they ever differed.
	* Instead, we raise an error, rather than parsing differently.
	*/
	prefix_len = header_path_len - path.size;

	if (strncmp(*header_path + prefix_len, path.ptr, path.size) != 0 ||
		(prefix_len > 0 && (*header_path)[prefix_len - 1] != '/'))
		return parse_err("rename path does not match header at line %d",
			ctx->line_num);

	*out = *header_path;
	*header_path = NULL;

	git_buf_free(&path);

	return 0;
}

static int parse_header_renamefrom(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	patch->base.delta->status |= GIT_DELTA_RENAMED;

	return parse_header_rename(
		(char **)&patch->base.delta->old_file.path,
		&ctx->header_old_path,
		ctx);
}

static int parse_header_renameto(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	patch->base.delta->status |= GIT_DELTA_RENAMED;

	return parse_header_rename(
		(char **)&patch->base.delta->new_file.path,
		&ctx->header_new_path,
		ctx);
}

static int parse_header_percent(uint16_t *out, patch_parse_ctx *ctx)
{
	int32_t val;
	const char *end;

	if (ctx->line_len < 1 || !git__isdigit(ctx->line[0]) ||
		git__strntol32(&val, ctx->line, ctx->line_len, &end, 10) < 0)
		return -1;

	parse_advance_chars(ctx, (end - ctx->line));

	if (parse_advance_expected(ctx, "%", 1) < 0)
		return -1;

	if (val > 100)
		return -1;

	*out = val;
	return 0;
}

static int parse_header_similarity(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	if (parse_header_percent(&patch->base.delta->similarity, ctx) < 0)
		return parse_err("invalid similarity percentage at line %d",
			ctx->line_num);

	return 0;
}

static int parse_header_dissimilarity(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	uint16_t dissimilarity;

	if (parse_header_percent(&dissimilarity, ctx) < 0)
		return parse_err("invalid similarity percentage at line %d",
			ctx->line_num);

	patch->base.delta->similarity = 100 - dissimilarity;

	return 0;
}

typedef struct {
	const char *str;
	int(*fn)(git_patch_parsed *, patch_parse_ctx *);
} header_git_op;

static const header_git_op header_git_ops[] = {
	{ "@@ -", NULL },
	{ "GIT binary patch", NULL },
	{ "--- ", parse_header_git_oldpath },
	{ "+++ ", parse_header_git_newpath },
	{ "index ", parse_header_git_index },
	{ "old mode ", parse_header_git_oldmode },
	{ "new mode ", parse_header_git_newmode },
	{ "deleted file mode ", parse_header_git_deletedfilemode },
	{ "new file mode ", parse_header_git_newfilemode },
	{ "rename from ", parse_header_renamefrom },
	{ "rename to ", parse_header_renameto },
	{ "rename old ", parse_header_renamefrom },
	{ "rename new ", parse_header_renameto },
	{ "similarity index ", parse_header_similarity },
	{ "dissimilarity index ", parse_header_dissimilarity },
};

static int parse_header_git(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	size_t i;
	int error = 0;

	/* Parse the diff --git line */
	if (parse_advance_expected(ctx, "diff --git ", 11) < 0)
		return parse_err("corrupt git diff header at line %d", ctx->line_num);

	if (parse_header_path(&ctx->header_old_path, ctx) < 0)
		return parse_err("corrupt old path in git diff header at line %d",
			ctx->line_num);

	if (parse_advance_ws(ctx) < 0 ||
		parse_header_path(&ctx->header_new_path, ctx) < 0)
		return parse_err("corrupt new path in git diff header at line %d",
			ctx->line_num);

	/* Parse remaining header lines */
	for (parse_advance_line(ctx); ctx->remain > 0; parse_advance_line(ctx)) {
		if (ctx->line_len == 0 || ctx->line[ctx->line_len - 1] != '\n')
			break;

		for (i = 0; i < ARRAY_SIZE(header_git_ops); i++) {
			const header_git_op *op = &header_git_ops[i];
			size_t op_len = strlen(op->str);

			if (memcmp(ctx->line, op->str, min(op_len, ctx->line_len)) != 0)
				continue;

			/* Do not advance if this is the patch separator */
			if (op->fn == NULL)
				goto done;

			parse_advance_chars(ctx, op_len);

			if ((error = op->fn(patch, ctx)) < 0)
				goto done;

			parse_advance_ws(ctx);
			parse_advance_expected(ctx, "\n", 1);

			if (ctx->line_len > 0) {
				error = parse_err("trailing data at line %d", ctx->line_num);
				goto done;
			}

			break;
		}
	}

done:
	return error;
}

static int parse_number(git_off_t *out, patch_parse_ctx *ctx)
{
	const char *end;
	int64_t num;

	if (!git__isdigit(ctx->line[0]))
		return -1;

	if (git__strntol64(&num, ctx->line, ctx->line_len, &end, 10) < 0)
		return -1;

	if (num < 0)
		return -1;

	*out = num;
	parse_advance_chars(ctx, (end - ctx->line));

	return 0;
}

static int parse_int(int *out, patch_parse_ctx *ctx)
{
	git_off_t num;

	if (parse_number(&num, ctx) < 0 || !git__is_int(num))
		return -1;

	*out = (int)num;
	return 0;
}

static int parse_hunk_header(
	git_patch_hunk *hunk,
	patch_parse_ctx *ctx)
{
	const char *header_start = ctx->line;

	hunk->hunk.old_lines = 1;
	hunk->hunk.new_lines = 1;

	if (parse_advance_expected(ctx, "@@ -", 4) < 0 ||
		parse_int(&hunk->hunk.old_start, ctx) < 0)
		goto fail;

	if (ctx->line_len > 0 && ctx->line[0] == ',') {
		if (parse_advance_expected(ctx, ",", 1) < 0 ||
			parse_int(&hunk->hunk.old_lines, ctx) < 0)
			goto fail;
	}

	if (parse_advance_expected(ctx, " +", 2) < 0 ||
		parse_int(&hunk->hunk.new_start, ctx) < 0)
		goto fail;

	if (ctx->line_len > 0 && ctx->line[0] == ',') {
		if (parse_advance_expected(ctx, ",", 1) < 0 ||
			parse_int(&hunk->hunk.new_lines, ctx) < 0)
			goto fail;
	}

	if (parse_advance_expected(ctx, " @@", 3) < 0)
		goto fail;

	parse_advance_line(ctx);

	if (!hunk->hunk.old_lines && !hunk->hunk.new_lines)
		goto fail;

	hunk->hunk.header_len = ctx->line - header_start;
	if (hunk->hunk.header_len > (GIT_DIFF_HUNK_HEADER_SIZE - 1))
		return parse_err("oversized patch hunk header at line %d",
			ctx->line_num);

	memcpy(hunk->hunk.header, header_start, hunk->hunk.header_len);
	hunk->hunk.header[hunk->hunk.header_len] = '\0';

	return 0;

fail:
	giterr_set(GITERR_PATCH, "invalid patch hunk header at line %d",
		ctx->line_num);
	return -1;
}

static int parse_hunk_body(
	git_patch_parsed *patch,
	git_patch_hunk *hunk,
	patch_parse_ctx *ctx)
{
	git_diff_line *line;
	int error = 0;

	int oldlines = hunk->hunk.old_lines;
	int newlines = hunk->hunk.new_lines;

	for (;
	ctx->remain > 4 && (oldlines || newlines) &&
		memcmp(ctx->line, "@@ -", 4) != 0;
		parse_advance_line(ctx)) {

		int origin;
		int prefix = 1;

		if (ctx->line_len == 0 || ctx->line[ctx->line_len - 1] != '\n') {
			error = parse_err("invalid patch instruction at line %d",
				ctx->line_num);
			goto done;
		}

		switch (ctx->line[0]) {
		case '\n':
			prefix = 0;

		case ' ':
			origin = GIT_DIFF_LINE_CONTEXT;
			oldlines--;
			newlines--;
			break;

		case '-':
			origin = GIT_DIFF_LINE_DELETION;
			oldlines--;
			break;

		case '+':
			origin = GIT_DIFF_LINE_ADDITION;
			newlines--;
			break;

		default:
			error = parse_err("invalid patch hunk at line %d", ctx->line_num);
			goto done;
		}

		line = git_array_alloc(patch->base.lines);
		GITERR_CHECK_ALLOC(line);

		memset(line, 0x0, sizeof(git_diff_line));

		line->content = ctx->line + prefix;
		line->content_len = ctx->line_len - prefix;
		line->content_offset = ctx->content_len - ctx->remain;
		line->origin = origin;

		hunk->line_count++;
	}

	if (oldlines || newlines) {
		error = parse_err(
			"invalid patch hunk, expected %d old lines and %d new lines",
			hunk->hunk.old_lines, hunk->hunk.new_lines);
		goto done;
	}

	/* Handle "\ No newline at end of file".  Only expect the leading
	* backslash, though, because the rest of the string could be
	* localized.  Because `diff` optimizes for the case where you
	* want to apply the patch by hand.
	*/
	if (ctx->line_len >= 2 && memcmp(ctx->line, "\\ ", 2) == 0 &&
		git_array_size(patch->base.lines) > 0) {

		line = git_array_get(patch->base.lines, git_array_size(patch->base.lines) - 1);

		if (line->content_len < 1) {
			error = parse_err("cannot trim trailing newline of empty line");
			goto done;
		}

		line->content_len--;

		parse_advance_line(ctx);
	}

done:
	return error;
}

static int check_filenames(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	/* For modechange only patches, it does not include filenames;
	 * instead we need to use the paths in the diff --git header.
	 */
	if (!patch->base.delta->old_file.path &&
		!patch->base.delta->new_file.path) {

		if (!ctx->header_old_path || !ctx->header_new_path)
			return parse_err("git diff header lacks old / new paths");

		patch->base.delta->old_file.path = ctx->header_old_path;
		ctx->header_old_path = NULL;

		patch->base.delta->new_file.path = ctx->header_new_path;
		ctx->header_new_path = NULL;
	}

	/* For additions that have a `diff --git` header, set the old path
	 * to the path from the header, not `/dev/null`.
	 */
	if (patch->base.delta->status == GIT_DELTA_ADDED &&
			ctx->header_old_path) {
		git__free((char *)patch->base.delta->old_file.path);
		patch->base.delta->old_file.path = ctx->header_old_path;
		ctx->header_old_path = NULL;
	}

	/* For deletes, set the new path to the path from the
	* `diff --git` header, not `/dev/null`.
	*/
	if (patch->base.delta->status == GIT_DELTA_DELETED &&
			ctx->header_new_path) {
		git__free((char *)patch->base.delta->new_file.path);
		patch->base.delta->new_file.path = ctx->header_new_path;
		ctx->header_new_path = NULL;
	}

	return 0;
}

static int parsed_patch_header(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	int error = 0;

	for (ctx->line = ctx->content; ctx->remain > 0; parse_advance_line(ctx)) {
		/* This line is too short to be a patch header. */
		if (ctx->line_len < 6)
			continue;

		/* This might be a hunk header without a patch header, provide a
		* sensible error message. */
		if (memcmp(ctx->line, "@@ -", 4) == 0) {
			size_t line_num = ctx->line_num;
			git_patch_hunk hunk;

			/* If this cannot be parsed as a hunk header, it's just leading
			* noise, continue.
			*/
			if (parse_hunk_header(&hunk, ctx) < 0) {
				giterr_clear();
				continue;
			}

			error = parse_err("invalid hunk header outside patch at line %d",
				line_num);
			goto done;
		}

		/* This buffer is too short to contain a patch. */
		if (ctx->remain < ctx->line_len + 6)
			break;

		/* A proper git patch */
		if (ctx->line_len >= 11 && memcmp(ctx->line, "diff --git ", 11) == 0) {
			if ((error = parse_header_git(patch, ctx)) < 0)
				goto done;

			error = check_filenames(patch, ctx);

			goto done;
		}

		error = 0;
		continue;
	}

	error = parse_err("no header in patch file");

done:
	return error;
}

static int parsed_patch_binary_side(
	git_diff_binary_file *binary,
	patch_parse_ctx *ctx)
{
	git_diff_binary_t type = GIT_DIFF_BINARY_NONE;
	git_buf base85 = GIT_BUF_INIT, decoded = GIT_BUF_INIT;
	git_off_t len;
	int error = 0;

	if (ctx->line_len >= 8 && memcmp(ctx->line, "literal ", 8) == 0) {
		type = GIT_DIFF_BINARY_LITERAL;
		parse_advance_chars(ctx, 8);
	}
	else if (ctx->line_len >= 6 && memcmp(ctx->line, "delta ", 6) == 0) {
		type = GIT_DIFF_BINARY_DELTA;
		parse_advance_chars(ctx, 6);
	}
	else {
		error = parse_err("unknown binary delta type at line %d", ctx->line_num);
		goto done;
	}

	if (parse_number(&len, ctx) < 0 || parse_advance_nl(ctx) < 0 || len < 0) {
		error = parse_err("invalid binary size at line %d", ctx->line_num);
		goto done;
	}

	while (ctx->line_len) {
		char c = ctx->line[0];
		size_t encoded_len, decoded_len = 0, decoded_orig = decoded.size;

		if (c == '\n')
			break;
		else if (c >= 'A' && c <= 'Z')
			decoded_len = c - 'A' + 1;
		else if (c >= 'a' && c <= 'z')
			decoded_len = c - 'a' + (('z' - 'a') + 1) + 1;

		if (!decoded_len) {
			error = parse_err("invalid binary length at line %d", ctx->line_num);
			goto done;
		}

		parse_advance_chars(ctx, 1);

		encoded_len = ((decoded_len / 4) + !!(decoded_len % 4)) * 5;

		if (encoded_len > ctx->line_len - 1) {
			error = parse_err("truncated binary data at line %d", ctx->line_num);
			goto done;
		}

		if ((error = git_buf_decode_base85(
			&decoded, ctx->line, encoded_len, decoded_len)) < 0)
			goto done;

		if (decoded.size - decoded_orig != decoded_len) {
			error = parse_err("truncated binary data at line %d", ctx->line_num);
			goto done;
		}

		parse_advance_chars(ctx, encoded_len);

		if (parse_advance_nl(ctx) < 0) {
			error = parse_err("trailing data at line %d", ctx->line_num);
			goto done;
		}
	}

	binary->type = type;
	binary->inflatedlen = (size_t)len;
	binary->datalen = decoded.size;
	binary->data = git_buf_detach(&decoded);

done:
	git_buf_free(&base85);
	git_buf_free(&decoded);
	return error;
}

static int parsed_patch_binary(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	int error;

	if (parse_advance_expected(ctx, "GIT binary patch", 16) < 0 ||
		parse_advance_nl(ctx) < 0)
		return parse_err("corrupt git binary header at line %d", ctx->line_num);

	/* parse old->new binary diff */
	if ((error = parsed_patch_binary_side(
			&patch->base.binary.new_file, ctx)) < 0)
		return error;

	if (parse_advance_nl(ctx) < 0)
		return parse_err("corrupt git binary separator at line %d",
			ctx->line_num);

	/* parse new->old binary diff */
	if ((error = parsed_patch_binary_side(
			&patch->base.binary.old_file, ctx)) < 0)
		return error;

	patch->base.delta->flags |= GIT_DIFF_FLAG_BINARY;
	return 0;
}

static int parsed_patch_hunks(
	git_patch_parsed *patch,
	patch_parse_ctx *ctx)
{
	git_patch_hunk *hunk;
	int error = 0;

	for (; ctx->line_len > 4 && memcmp(ctx->line, "@@ -", 4) == 0; ) {

		hunk = git_array_alloc(patch->base.hunks);
		GITERR_CHECK_ALLOC(hunk);

		memset(hunk, 0, sizeof(git_patch_hunk));

		hunk->line_start = git_array_size(patch->base.lines);
		hunk->line_count = 0;

		if ((error = parse_hunk_header(hunk, ctx)) < 0 ||
			(error = parse_hunk_body(patch, hunk, ctx)) < 0)
			goto done;
	}

done:
	return error;
}

static int parsed_patch_body(
	git_patch_parsed *patch, patch_parse_ctx *ctx)
{
	if (ctx->line_len >= 16 && memcmp(ctx->line, "GIT binary patch", 16) == 0)
		return parsed_patch_binary(patch, ctx);

	else if (ctx->line_len >= 4 && memcmp(ctx->line, "@@ -", 4) == 0)
		return parsed_patch_hunks(patch, ctx);

	return 0;
}

static int check_patch(git_patch_parsed *patch)
{
	if (!patch->base.delta->old_file.path &&
			patch->base.delta->status != GIT_DELTA_ADDED)
		return parse_err("missing old file path");

	if (!patch->base.delta->new_file.path &&
			patch->base.delta->status != GIT_DELTA_DELETED)
		return parse_err("missing new file path");

	if (patch->base.delta->old_file.path &&
			patch->base.delta->status != GIT_DELTA_DELETED &&
			!patch->base.delta->new_file.mode)
		patch->base.delta->new_file.mode = patch->base.delta->old_file.mode;

	if (patch->base.delta->status == GIT_DELTA_MODIFIED &&
		!(patch->base.delta->flags & GIT_DIFF_FLAG_BINARY) &&
		patch->base.delta->new_file.mode == patch->base.delta->old_file.mode &&
		git_array_size(patch->base.hunks) == 0)
		return parse_err("patch with no hunks");

	return 0;
}

int git_patch_from_patchfile(
	git_patch **out,
	const char *content,
	size_t content_len)
{
	patch_parse_ctx ctx = { 0 };
	git_patch_parsed *patch;
	int error = 0;

	*out = NULL;

	patch = git__calloc(1, sizeof(git_patch_parsed));
	GITERR_CHECK_ALLOC(patch);

	/* TODO: allow callers to specify prefix depth (eg, `-p2`) */
	patch->base.diff_opts.new_prefix = "";
	patch->base.diff_opts.old_prefix = "";
	patch->base.diff_opts.flags |= GIT_DIFF_SHOW_BINARY;

	patch->base.delta = git__calloc(1, sizeof(git_diff_delta));
	patch->base.delta->status = GIT_DELTA_MODIFIED;
	patch->base.delta->nfiles = 2;

	ctx.content = content;
	ctx.content_len = content_len;
	ctx.remain = content_len;

	if ((error = parsed_patch_header(patch, &ctx)) < 0 ||
		(error = parsed_patch_body(patch, &ctx)) < 0 ||
		(error = check_patch(patch)) < 0)
		goto done;

	GIT_REFCOUNT_INC(patch);
	*out = &patch->base;

done:
	git__free(ctx.header_old_path);
	git__free(ctx.header_new_path);

	return error;
}