author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:24 (UTC) |
commit | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (patch) (unidiff) | |
tree | b5a2acddf2403fcbaecc17b206ec44044a30cf27 /shared.c | |
parent | ae1d4d75b2a2eb3534ff4b3685cc5c0b80007ef7 (diff) | |
download | cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.zip cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.tar.gz cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.tar.bz2 |
shared.c: avoid SEGFAULT when checking for binary buffers
Before calling buffer_is_binary() we need to verify that the buffer
is valid.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -210,130 +210,130 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | |||
210 | } | 210 | } |
211 | return 1; | 211 | return 1; |
212 | } | 212 | } |
213 | 213 | ||
214 | /* | 214 | /* |
215 | * Receive diff-buffers from xdiff and concatenate them as | 215 | * Receive diff-buffers from xdiff and concatenate them as |
216 | * needed across multiple callbacks. | 216 | * needed across multiple callbacks. |
217 | * | 217 | * |
218 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 218 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
219 | * ripped from git and modified to use globals instead of | 219 | * ripped from git and modified to use globals instead of |
220 | * a special callback-struct. | 220 | * a special callback-struct. |
221 | */ | 221 | */ |
222 | char *diffbuf = NULL; | 222 | char *diffbuf = NULL; |
223 | int buflen = 0; | 223 | int buflen = 0; |
224 | 224 | ||
225 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 225 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
226 | { | 226 | { |
227 | int i; | 227 | int i; |
228 | 228 | ||
229 | for (i = 0; i < nbuf; i++) { | 229 | for (i = 0; i < nbuf; i++) { |
230 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 230 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
231 | /* Incomplete line */ | 231 | /* Incomplete line */ |
232 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 232 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
233 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 233 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
234 | buflen += mb[i].size; | 234 | buflen += mb[i].size; |
235 | continue; | 235 | continue; |
236 | } | 236 | } |
237 | 237 | ||
238 | /* we have a complete line */ | 238 | /* we have a complete line */ |
239 | if (!diffbuf) { | 239 | if (!diffbuf) { |
240 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 240 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
241 | continue; | 241 | continue; |
242 | } | 242 | } |
243 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 243 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
244 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 244 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
245 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 245 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
246 | free(diffbuf); | 246 | free(diffbuf); |
247 | diffbuf = NULL; | 247 | diffbuf = NULL; |
248 | buflen = 0; | 248 | buflen = 0; |
249 | } | 249 | } |
250 | if (diffbuf) { | 250 | if (diffbuf) { |
251 | ((linediff_fn)priv)(diffbuf, buflen); | 251 | ((linediff_fn)priv)(diffbuf, buflen); |
252 | free(diffbuf); | 252 | free(diffbuf); |
253 | diffbuf = NULL; | 253 | diffbuf = NULL; |
254 | buflen = 0; | 254 | buflen = 0; |
255 | } | 255 | } |
256 | return 0; | 256 | return 0; |
257 | } | 257 | } |
258 | 258 | ||
259 | int cgit_diff_files(const unsigned char *old_sha1, | 259 | int cgit_diff_files(const unsigned char *old_sha1, |
260 | const unsigned char *new_sha1, unsigned long *old_size, | 260 | const unsigned char *new_sha1, unsigned long *old_size, |
261 | unsigned long *new_size, int *binary, linediff_fn fn) | 261 | unsigned long *new_size, int *binary, linediff_fn fn) |
262 | { | 262 | { |
263 | mmfile_t file1, file2; | 263 | mmfile_t file1, file2; |
264 | xpparam_t diff_params; | 264 | xpparam_t diff_params; |
265 | xdemitconf_t emit_params; | 265 | xdemitconf_t emit_params; |
266 | xdemitcb_t emit_cb; | 266 | xdemitcb_t emit_cb; |
267 | 267 | ||
268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
269 | return 1; | 269 | return 1; |
270 | 270 | ||
271 | *old_size = file1.size; | 271 | *old_size = file1.size; |
272 | *new_size = file2.size; | 272 | *new_size = file2.size; |
273 | 273 | ||
274 | if (buffer_is_binary(file1.ptr, file1.size) || | 274 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
275 | buffer_is_binary(file2.ptr, file2.size)) { | 275 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
276 | *binary = 1; | 276 | *binary = 1; |
277 | return 0; | 277 | return 0; |
278 | } | 278 | } |
279 | 279 | ||
280 | memset(&diff_params, 0, sizeof(diff_params)); | 280 | memset(&diff_params, 0, sizeof(diff_params)); |
281 | memset(&emit_params, 0, sizeof(emit_params)); | 281 | memset(&emit_params, 0, sizeof(emit_params)); |
282 | memset(&emit_cb, 0, sizeof(emit_cb)); | 282 | memset(&emit_cb, 0, sizeof(emit_cb)); |
283 | diff_params.flags = XDF_NEED_MINIMAL; | 283 | diff_params.flags = XDF_NEED_MINIMAL; |
284 | emit_params.ctxlen = 3; | 284 | emit_params.ctxlen = 3; |
285 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 285 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
286 | emit_cb.outf = filediff_cb; | 286 | emit_cb.outf = filediff_cb; |
287 | emit_cb.priv = fn; | 287 | emit_cb.priv = fn; |
288 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 288 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
289 | return 0; | 289 | return 0; |
290 | } | 290 | } |
291 | 291 | ||
292 | void cgit_diff_tree(const unsigned char *old_sha1, | 292 | void cgit_diff_tree(const unsigned char *old_sha1, |
293 | const unsigned char *new_sha1, | 293 | const unsigned char *new_sha1, |
294 | filepair_fn fn, const char *prefix) | 294 | filepair_fn fn, const char *prefix) |
295 | { | 295 | { |
296 | struct diff_options opt; | 296 | struct diff_options opt; |
297 | int ret; | 297 | int ret; |
298 | int prefixlen; | 298 | int prefixlen; |
299 | 299 | ||
300 | diff_setup(&opt); | 300 | diff_setup(&opt); |
301 | opt.output_format = DIFF_FORMAT_CALLBACK; | 301 | opt.output_format = DIFF_FORMAT_CALLBACK; |
302 | opt.detect_rename = 1; | 302 | opt.detect_rename = 1; |
303 | opt.rename_limit = ctx.cfg.renamelimit; | 303 | opt.rename_limit = ctx.cfg.renamelimit; |
304 | DIFF_OPT_SET(&opt, RECURSIVE); | 304 | DIFF_OPT_SET(&opt, RECURSIVE); |
305 | opt.format_callback = cgit_diff_tree_cb; | 305 | opt.format_callback = cgit_diff_tree_cb; |
306 | opt.format_callback_data = fn; | 306 | opt.format_callback_data = fn; |
307 | if (prefix) { | 307 | if (prefix) { |
308 | opt.nr_paths = 1; | 308 | opt.nr_paths = 1; |
309 | opt.paths = &prefix; | 309 | opt.paths = &prefix; |
310 | prefixlen = strlen(prefix); | 310 | prefixlen = strlen(prefix); |
311 | opt.pathlens = &prefixlen; | 311 | opt.pathlens = &prefixlen; |
312 | } | 312 | } |
313 | diff_setup_done(&opt); | 313 | diff_setup_done(&opt); |
314 | 314 | ||
315 | if (old_sha1 && !is_null_sha1(old_sha1)) | 315 | if (old_sha1 && !is_null_sha1(old_sha1)) |
316 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 316 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
317 | else | 317 | else |
318 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 318 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
319 | diffcore_std(&opt); | 319 | diffcore_std(&opt); |
320 | diff_flush(&opt); | 320 | diff_flush(&opt); |
321 | } | 321 | } |
322 | 322 | ||
323 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 323 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
324 | { | 324 | { |
325 | unsigned char *old_sha1 = NULL; | 325 | unsigned char *old_sha1 = NULL; |
326 | 326 | ||
327 | if (commit->parents) | 327 | if (commit->parents) |
328 | old_sha1 = commit->parents->item->object.sha1; | 328 | old_sha1 = commit->parents->item->object.sha1; |
329 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 329 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
330 | } | 330 | } |
331 | 331 | ||
332 | int cgit_parse_snapshots_mask(const char *str) | 332 | int cgit_parse_snapshots_mask(const char *str) |
333 | { | 333 | { |
334 | const struct cgit_snapshot_format *f; | 334 | const struct cgit_snapshot_format *f; |
335 | static const char *delim = " \t,:/|;"; | 335 | static const char *delim = " \t,:/|;"; |
336 | int tl, sl, rv = 0; | 336 | int tl, sl, rv = 0; |
337 | 337 | ||
338 | /* favor legacy setting */ | 338 | /* favor legacy setting */ |
339 | if(atoi(str)) | 339 | if(atoi(str)) |