author | Augie Fackler <augie@google.com> |
Thu, 03 May 2018 12:54:20 -0400 | |
branch | stable |
changeset 37864 | b8b253aec953 |
parent 37863 | 1ec4cb8cbc87 |
child 37865 | 0b208c13781c |
permissions | -rw-r--r-- |
72 | 1 |
/* |
2 |
mpatch.c - efficient binary patching for Mercurial |
|
3 |
||
4 |
This implements a patch algorithm that's O(m + nlog n) where m is the |
|
5 |
size of the output and n is the number of patches. |
|
6 |
||
7 |
Given a list of binary patches, it unpacks each into a hunk list, |
|
8 |
then combines the hunk lists with a treewise recursion to form a |
|
9 |
single hunk list. This hunk list is then applied to the original |
|
10 |
text. |
|
11 |
||
12 |
The text (or binary) fragments are copied directly from their source |
|
13 |
Python objects into a preallocated output string to avoid the |
|
14 |
allocation of intermediate Python objects. Working memory is about 2x |
|
15 |
the total number of hunks. |
|
16 |
||
2859 | 17 |
Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
72 | 18 |
|
19 |
This software may be used and distributed according to the terms |
|
20 |
of the GNU General Public License, incorporated herein by reference. |
|
21 |
*/ |
|
22 |
||
37863
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
23 |
#include <limits.h> |
72 | 24 |
#include <stdlib.h> |
25 |
#include <string.h> |
|
2468
1ac0574f1768
mac os x: fixes for 10.2 from chris monson <monpublic@gmail.com>
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2083
diff
changeset
|
26 |
|
29444
284d742e5611
internals: move the bitmanipulation routines into its own file
Maciej Fijalkowski <fijall@gmail.com>
parents:
28782
diff
changeset
|
27 |
#include "bitmanipulation.h" |
29705
e9a0bcc9314d
mpatch: change Py_ssize_t to ssize_t in places that will be later copied
Maciej Fijalkowski <fijall@gmail.com>
parents:
29444
diff
changeset
|
28 |
#include "compat.h" |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
29 |
#include "mpatch.h" |
72 | 30 |
|
37863
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
31 |
/* VC9 doesn't include bool and lacks stdbool.h based on cext/util.h */ |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
32 |
#if defined(_MSC_VER) || __STDC_VERSION__ < 199901L |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
33 |
#define true 1 |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
34 |
#define false 0 |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
35 |
typedef unsigned char bool; |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
36 |
#else |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
37 |
#include <stdbool.h> |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
38 |
#endif |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
39 |
|
29753
9a1685c70db4
mpatch: change lalloc() to local function
Yuya Nishihara <yuya@tcha.org>
parents:
29752
diff
changeset
|
40 |
static struct mpatch_flist *lalloc(ssize_t size) |
72 | 41 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
42 |
struct mpatch_flist *a = NULL; |
72 | 43 |
|
3138
cc856c4d91ca
mpatch: Fix for malloc corner case on AIX
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
44 |
if (size < 1) |
cc856c4d91ca
mpatch: Fix for malloc corner case on AIX
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
45 |
size = 1; |
cc856c4d91ca
mpatch: Fix for malloc corner case on AIX
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
46 |
|
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
47 |
a = (struct mpatch_flist *)malloc(sizeof(struct mpatch_flist)); |
128 | 48 |
if (a) { |
34633
347c0f4232e1
mpatch: re-wrap wide line with clang-format
Augie Fackler <augie@google.com>
parents:
29761
diff
changeset
|
49 |
a->base = (struct mpatch_frag *)malloc( |
347c0f4232e1
mpatch: re-wrap wide line with clang-format
Augie Fackler <augie@google.com>
parents:
29761
diff
changeset
|
50 |
sizeof(struct mpatch_frag) * size); |
2048
8f9660c568b8
Set correct exception for another possible malloc error in mpatch.c
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1978
diff
changeset
|
51 |
if (a->base) { |
128 | 52 |
a->head = a->tail = a->base; |
2048
8f9660c568b8
Set correct exception for another possible malloc error in mpatch.c
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1978
diff
changeset
|
53 |
return a; |
8f9660c568b8
Set correct exception for another possible malloc error in mpatch.c
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1978
diff
changeset
|
54 |
} |
8f9660c568b8
Set correct exception for another possible malloc error in mpatch.c
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1978
diff
changeset
|
55 |
free(a); |
128 | 56 |
} |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
57 |
return NULL; |
72 | 58 |
} |
59 |
||
29707
b9b9f9a92481
mpatch: split mpatch into two files
Maciej Fijalkowski <fijall@gmail.com>
parents:
29706
diff
changeset
|
60 |
void mpatch_lfree(struct mpatch_flist *a) |
72 | 61 |
{ |
128 | 62 |
if (a) { |
63 |
free(a->base); |
|
64 |
free(a); |
|
65 |
} |
|
72 | 66 |
} |
67 |
||
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
68 |
static ssize_t lsize(struct mpatch_flist *a) |
72 | 69 |
{ |
70 |
return a->tail - a->head; |
|
71 |
} |
|
72 |
||
37863
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
73 |
/* add helper to add src and *dest iff it won't overflow */ |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
74 |
static inline bool safeadd(int src, int *dest) |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
75 |
{ |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
76 |
if ((src > 0) == (*dest > 0)) { |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
77 |
if (*dest > 0) { |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
78 |
if (src > (INT_MAX - *dest)) { |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
79 |
return false; |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
80 |
} |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
81 |
} else { |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
82 |
if (src < (INT_MIN - *dest)) { |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
83 |
return false; |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
84 |
} |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
85 |
} |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
86 |
} |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
87 |
*dest += src; |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
88 |
return true; |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
89 |
} |
1ec4cb8cbc87
mpatch: introduce a safeadd() helper to work around UB int overflow
Augie Fackler <augie@google.com>
parents:
37862
diff
changeset
|
90 |
|
37864
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
91 |
/* subtract src from dest and store result in dest */ |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
92 |
static inline bool safesub(int src, int *dest) |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
93 |
{ |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
94 |
if (((src > 0) && (*dest < INT_MIN + src)) || |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
95 |
((src < 0) && (*dest > INT_MAX + src))) { |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
96 |
return false; |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
97 |
} |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
98 |
*dest -= src; |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
99 |
return true; |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
100 |
} |
b8b253aec953
mpatch: introduce a safesub() helper as well
Augie Fackler <augie@google.com>
parents:
37863
diff
changeset
|
101 |
|
72 | 102 |
/* move hunks in source that are less cut to dest, compensating |
103 |
for changes in offset. the last hunk may be split if necessary. |
|
104 |
*/ |
|
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
105 |
static int gather(struct mpatch_flist *dest, struct mpatch_flist *src, int cut, |
34800
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
106 |
int offset) |
72 | 107 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
108 |
struct mpatch_frag *d = dest->tail, *s = src->head; |
72 | 109 |
int postend, c, l; |
110 |
||
111 |
while (s != src->tail) { |
|
112 |
if (s->start + offset >= cut) |
|
82 | 113 |
break; /* we've gone far enough */ |
72 | 114 |
|
115 |
postend = offset + s->start + s->len; |
|
116 |
if (postend <= cut) { |
|
117 |
/* save this hunk */ |
|
118 |
offset += s->start + s->len - s->end; |
|
119 |
*d++ = *s++; |
|
34634
2e08b69bcd29
mpatch: reflow two oddly formatted else blocks with clang-format
Augie Fackler <augie@google.com>
parents:
34633
diff
changeset
|
120 |
} else { |
72 | 121 |
/* break up this hunk */ |
122 |
c = cut - offset; |
|
123 |
if (s->end < c) |
|
124 |
c = s->end; |
|
125 |
l = cut - offset - s->start; |
|
126 |
if (s->len < l) |
|
127 |
l = s->len; |
|
128 |
||
129 |
offset += s->start + l - c; |
|
130 |
||
131 |
d->start = s->start; |
|
132 |
d->end = c; |
|
133 |
d->len = l; |
|
134 |
d->data = s->data; |
|
135 |
d++; |
|
136 |
s->start = c; |
|
137 |
s->len = s->len - l; |
|
138 |
s->data = s->data + l; |
|
139 |
||
82 | 140 |
break; |
72 | 141 |
} |
142 |
} |
|
143 |
||
144 |
dest->tail = d; |
|
145 |
src->head = s; |
|
146 |
return offset; |
|
147 |
} |
|
148 |
||
149 |
/* like gather, but with no output list */ |
|
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
150 |
static int discard(struct mpatch_flist *src, int cut, int offset) |
72 | 151 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
152 |
struct mpatch_frag *s = src->head; |
72 | 153 |
int postend, c, l; |
154 |
||
155 |
while (s != src->tail) { |
|
156 |
if (s->start + offset >= cut) |
|
82 | 157 |
break; |
72 | 158 |
|
159 |
postend = offset + s->start + s->len; |
|
160 |
if (postend <= cut) { |
|
161 |
offset += s->start + s->len - s->end; |
|
162 |
s++; |
|
34634
2e08b69bcd29
mpatch: reflow two oddly formatted else blocks with clang-format
Augie Fackler <augie@google.com>
parents:
34633
diff
changeset
|
163 |
} else { |
72 | 164 |
c = cut - offset; |
165 |
if (s->end < c) |
|
166 |
c = s->end; |
|
167 |
l = cut - offset - s->start; |
|
168 |
if (s->len < l) |
|
169 |
l = s->len; |
|
170 |
||
171 |
offset += s->start + l - c; |
|
172 |
s->start = c; |
|
173 |
s->len = s->len - l; |
|
174 |
s->data = s->data + l; |
|
175 |
||
82 | 176 |
break; |
72 | 177 |
} |
178 |
} |
|
179 |
||
180 |
src->head = s; |
|
181 |
return offset; |
|
182 |
} |
|
183 |
||
184 |
/* combine hunk lists a and b, while adjusting b for offset changes in a/ |
|
185 |
this deletes a and b and returns the resultant list. */ |
|
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
186 |
static struct mpatch_flist *combine(struct mpatch_flist *a, |
34800
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
187 |
struct mpatch_flist *b) |
72 | 188 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
189 |
struct mpatch_flist *c = NULL; |
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
190 |
struct mpatch_frag *bh, *ct; |
72 | 191 |
int offset = 0, post; |
192 |
||
128 | 193 |
if (a && b) |
194 |
c = lalloc((lsize(a) + lsize(b)) * 2); |
|
195 |
||
196 |
if (c) { |
|
72 | 197 |
|
128 | 198 |
for (bh = b->head; bh != b->tail; bh++) { |
199 |
/* save old hunks */ |
|
200 |
offset = gather(c, a, bh->start, offset); |
|
72 | 201 |
|
128 | 202 |
/* discard replaced hunks */ |
203 |
post = discard(a, bh->end, offset); |
|
72 | 204 |
|
128 | 205 |
/* insert new hunk */ |
206 |
ct = c->tail; |
|
207 |
ct->start = bh->start - offset; |
|
208 |
ct->end = bh->end - post; |
|
209 |
ct->len = bh->len; |
|
210 |
ct->data = bh->data; |
|
211 |
c->tail++; |
|
212 |
offset = post; |
|
213 |
} |
|
214 |
||
215 |
/* hold on to tail from a */ |
|
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
216 |
memcpy(c->tail, a->head, sizeof(struct mpatch_frag) * lsize(a)); |
128 | 217 |
c->tail += lsize(a); |
72 | 218 |
} |
219 |
||
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
220 |
mpatch_lfree(a); |
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
221 |
mpatch_lfree(b); |
72 | 222 |
return c; |
223 |
} |
|
224 |
||
225 |
/* decode a binary patch into a hunk list */ |
|
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
226 |
int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res) |
72 | 227 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
228 |
struct mpatch_flist *l; |
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
229 |
struct mpatch_frag *lt; |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
230 |
int pos = 0; |
72 | 231 |
|
232 |
/* assume worst case size, we won't have many of these lists */ |
|
28656
b6ed2505d6cf
parsers: fix list sizing rounding error (SEC)
Matt Mackall <mpm@selenic.com>
parents:
20167
diff
changeset
|
233 |
l = lalloc(len / 12 + 1); |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
234 |
if (!l) |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
235 |
return MPATCH_ERR_NO_MEM; |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
236 |
|
72 | 237 |
lt = l->tail; |
238 |
||
37860
90a274965de7
mpatch: be more careful about parsing binary patch data (SEC)
Augie Fackler <augie@google.com>
parents:
34801
diff
changeset
|
239 |
/* We check against len-11 to ensure we have at least 12 bytes |
90a274965de7
mpatch: be more careful about parsing binary patch data (SEC)
Augie Fackler <augie@google.com>
parents:
34801
diff
changeset
|
240 |
left in the patch so we can read our three be32s out of it. */ |
90a274965de7
mpatch: be more careful about parsing binary patch data (SEC)
Augie Fackler <augie@google.com>
parents:
34801
diff
changeset
|
241 |
while (pos >= 0 && pos < (len - 11)) { |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
242 |
lt->start = getbe32(bin + pos); |
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
243 |
lt->end = getbe32(bin + pos + 4); |
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
244 |
lt->len = getbe32(bin + pos + 8); |
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
245 |
lt->data = bin + pos + 12; |
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
246 |
pos += 12 + lt->len; |
28657
b9714d958e89
parsers: detect short records (SEC)
Matt Mackall <mpm@selenic.com>
parents:
28656
diff
changeset
|
247 |
if (lt->start > lt->end || lt->len < 0) |
b9714d958e89
parsers: detect short records (SEC)
Matt Mackall <mpm@selenic.com>
parents:
28656
diff
changeset
|
248 |
break; /* sanity check */ |
72 | 249 |
lt++; |
250 |
} |
|
251 |
||
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
16758
diff
changeset
|
252 |
if (pos != len) { |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
253 |
mpatch_lfree(l); |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
254 |
return MPATCH_ERR_CANNOT_BE_DECODED; |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
255 |
} |
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
256 |
|
72 | 257 |
l->tail = lt; |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
258 |
*res = l; |
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
259 |
return 0; |
72 | 260 |
} |
261 |
||
262 |
/* calculate the size of resultant text */ |
|
29707
b9b9f9a92481
mpatch: split mpatch into two files
Maciej Fijalkowski <fijall@gmail.com>
parents:
29706
diff
changeset
|
263 |
ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l) |
72 | 264 |
{ |
29705
e9a0bcc9314d
mpatch: change Py_ssize_t to ssize_t in places that will be later copied
Maciej Fijalkowski <fijall@gmail.com>
parents:
29444
diff
changeset
|
265 |
ssize_t outlen = 0, last = 0; |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
266 |
struct mpatch_frag *f = l->head; |
72 | 267 |
|
268 |
while (f != l->tail) { |
|
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
269 |
if (f->start < last || f->end > len) { |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
270 |
return MPATCH_ERR_INVALID_PATCH; |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
271 |
} |
72 | 272 |
outlen += f->start - last; |
273 |
last = f->end; |
|
274 |
outlen += f->len; |
|
275 |
f++; |
|
276 |
} |
|
277 |
||
278 |
outlen += len - last; |
|
279 |
return outlen; |
|
280 |
} |
|
281 |
||
29707
b9b9f9a92481
mpatch: split mpatch into two files
Maciej Fijalkowski <fijall@gmail.com>
parents:
29706
diff
changeset
|
282 |
int mpatch_apply(char *buf, const char *orig, ssize_t len, |
34800
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
283 |
struct mpatch_flist *l) |
72 | 284 |
{ |
29706
6b3a8d034b69
mpatch: provide things that will be exported later with a prefixed name
Maciej Fijalkowski <fijall@gmail.com>
parents:
29705
diff
changeset
|
285 |
struct mpatch_frag *f = l->head; |
72 | 286 |
int last = 0; |
287 |
char *p = buf; |
|
288 |
||
289 |
while (f != l->tail) { |
|
37862
faa924469635
mpatch: ensure fragment start isn't past the end of orig (SEC)
Augie Fackler <augie@google.com>
parents:
37861
diff
changeset
|
290 |
if (f->start < last || f->start > len || f->end > len || |
faa924469635
mpatch: ensure fragment start isn't past the end of orig (SEC)
Augie Fackler <augie@google.com>
parents:
37861
diff
changeset
|
291 |
last < 0) { |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
292 |
return MPATCH_ERR_INVALID_PATCH; |
1722
681c5c211b92
catch errors and throw exception with invalid binary patch data
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
597
diff
changeset
|
293 |
} |
72 | 294 |
memcpy(p, orig + last, f->start - last); |
295 |
p += f->start - last; |
|
296 |
memcpy(p, f->data, f->len); |
|
297 |
last = f->end; |
|
298 |
p += f->len; |
|
299 |
f++; |
|
300 |
} |
|
37861
1acfc35d478c
mpatch: protect against underflow in mpatch_apply (SEC)
Augie Fackler <augie@google.com>
parents:
37860
diff
changeset
|
301 |
if (last < 0) { |
1acfc35d478c
mpatch: protect against underflow in mpatch_apply (SEC)
Augie Fackler <augie@google.com>
parents:
37860
diff
changeset
|
302 |
return MPATCH_ERR_INVALID_PATCH; |
1acfc35d478c
mpatch: protect against underflow in mpatch_apply (SEC)
Augie Fackler <augie@google.com>
parents:
37860
diff
changeset
|
303 |
} |
72 | 304 |
memcpy(p, orig + last, len - last); |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
305 |
return 0; |
72 | 306 |
} |
307 |
||
308 |
/* recursively generate a patch of all bins between start and end */ |
|
34800
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
309 |
struct mpatch_flist * |
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
310 |
mpatch_fold(void *bins, struct mpatch_flist *(*get_next_item)(void *, ssize_t), |
761355833867
mpatch: reformat function prototypes with clang-format
Augie Fackler <augie@google.com>
parents:
34634
diff
changeset
|
311 |
ssize_t start, ssize_t end) |
72 | 312 |
{ |
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
313 |
ssize_t len; |
72 | 314 |
|
315 |
if (start + 1 == end) { |
|
316 |
/* trivial case, output a decoded list */ |
|
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
317 |
return get_next_item(bins, start); |
72 | 318 |
} |
319 |
||
320 |
/* divide and conquer, memory management is elsewhere */ |
|
321 |
len = (end - start) / 2; |
|
29708
55dd12204b8e
mpatch: remove dependency on Python.h in mpatch.c
Maciej Fijalkowski <fijall@gmail.com>
parents:
29707
diff
changeset
|
322 |
return combine(mpatch_fold(bins, get_next_item, start, start + len), |
34801
1f4249c764f1
mpatch: switch alignment of wrapped line from tab to spaces with clang-format
Augie Fackler <augie@google.com>
parents:
34800
diff
changeset
|
323 |
mpatch_fold(bins, get_next_item, start + len, end)); |
72 | 324 |
} |