summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-04-07 22:48:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-04-07 22:48:36 (UTC)
commitce761fde0772236a11b41270f9254c515f724ad5 (patch) (unidiff)
tree8a7922811e56727c1444a3a93deecef2d2c08841
parent9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff)
downloadcgit-ce761fde0772236a11b41270f9254c515f724ad5.zip
cgit-ce761fde0772236a11b41270f9254c515f724ad5.tar.gz
cgit-ce761fde0772236a11b41270f9254c515f724ad5.tar.bz2
shared.c: avoid memory leak during diff
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 9362d21..6adf2b6 100644
--- a/shared.c
+++ b/shared.c
@@ -233,108 +233,116 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
233 for (i = 0; i < nbuf; i++) { 233 for (i = 0; i < nbuf; i++) {
234 if (mb[i].ptr[mb[i].size-1] != '\n') { 234 if (mb[i].ptr[mb[i].size-1] != '\n') {
235 /* Incomplete line */ 235 /* Incomplete line */
236 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 236 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
237 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 237 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
238 buflen += mb[i].size; 238 buflen += mb[i].size;
239 continue; 239 continue;
240 } 240 }
241 241
242 /* we have a complete line */ 242 /* we have a complete line */
243 if (!diffbuf) { 243 if (!diffbuf) {
244 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 244 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
245 continue; 245 continue;
246 } 246 }
247 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 247 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
248 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 248 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
249 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 249 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
250 free(diffbuf); 250 free(diffbuf);
251 diffbuf = NULL; 251 diffbuf = NULL;
252 buflen = 0; 252 buflen = 0;
253 } 253 }
254 if (diffbuf) { 254 if (diffbuf) {
255 ((linediff_fn)priv)(diffbuf, buflen); 255 ((linediff_fn)priv)(diffbuf, buflen);
256 free(diffbuf); 256 free(diffbuf);
257 diffbuf = NULL; 257 diffbuf = NULL;
258 buflen = 0; 258 buflen = 0;
259 } 259 }
260 return 0; 260 return 0;
261} 261}
262 262
263int cgit_diff_files(const unsigned char *old_sha1, 263int cgit_diff_files(const unsigned char *old_sha1,
264 const unsigned char *new_sha1, unsigned long *old_size, 264 const unsigned char *new_sha1, unsigned long *old_size,
265 unsigned long *new_size, int *binary, linediff_fn fn) 265 unsigned long *new_size, int *binary, linediff_fn fn)
266{ 266{
267 mmfile_t file1, file2; 267 mmfile_t file1, file2;
268 xpparam_t diff_params; 268 xpparam_t diff_params;
269 xdemitconf_t emit_params; 269 xdemitconf_t emit_params;
270 xdemitcb_t emit_cb; 270 xdemitcb_t emit_cb;
271 271
272 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 272 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
273 return 1; 273 return 1;
274 274
275 *old_size = file1.size; 275 *old_size = file1.size;
276 *new_size = file2.size; 276 *new_size = file2.size;
277 277
278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || 278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { 279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
280 *binary = 1; 280 *binary = 1;
281 if (file1.size)
282 free(file1.ptr);
283 if (file2.size)
284 free(file2.ptr);
281 return 0; 285 return 0;
282 } 286 }
283 287
284 memset(&diff_params, 0, sizeof(diff_params)); 288 memset(&diff_params, 0, sizeof(diff_params));
285 memset(&emit_params, 0, sizeof(emit_params)); 289 memset(&emit_params, 0, sizeof(emit_params));
286 memset(&emit_cb, 0, sizeof(emit_cb)); 290 memset(&emit_cb, 0, sizeof(emit_cb));
287 diff_params.flags = XDF_NEED_MINIMAL; 291 diff_params.flags = XDF_NEED_MINIMAL;
288 emit_params.ctxlen = 3; 292 emit_params.ctxlen = 3;
289 emit_params.flags = XDL_EMIT_FUNCNAMES; 293 emit_params.flags = XDL_EMIT_FUNCNAMES;
290 emit_cb.outf = filediff_cb; 294 emit_cb.outf = filediff_cb;
291 emit_cb.priv = fn; 295 emit_cb.priv = fn;
292 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 296 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
297 if (file1.size)
298 free(file1.ptr);
299 if (file2.size)
300 free(file2.ptr);
293 return 0; 301 return 0;
294} 302}
295 303
296void cgit_diff_tree(const unsigned char *old_sha1, 304void cgit_diff_tree(const unsigned char *old_sha1,
297 const unsigned char *new_sha1, 305 const unsigned char *new_sha1,
298 filepair_fn fn, const char *prefix) 306 filepair_fn fn, const char *prefix)
299{ 307{
300 struct diff_options opt; 308 struct diff_options opt;
301 int ret; 309 int ret;
302 int prefixlen; 310 int prefixlen;
303 311
304 diff_setup(&opt); 312 diff_setup(&opt);
305 opt.output_format = DIFF_FORMAT_CALLBACK; 313 opt.output_format = DIFF_FORMAT_CALLBACK;
306 opt.detect_rename = 1; 314 opt.detect_rename = 1;
307 opt.rename_limit = ctx.cfg.renamelimit; 315 opt.rename_limit = ctx.cfg.renamelimit;
308 DIFF_OPT_SET(&opt, RECURSIVE); 316 DIFF_OPT_SET(&opt, RECURSIVE);
309 opt.format_callback = cgit_diff_tree_cb; 317 opt.format_callback = cgit_diff_tree_cb;
310 opt.format_callback_data = fn; 318 opt.format_callback_data = fn;
311 if (prefix) { 319 if (prefix) {
312 opt.nr_paths = 1; 320 opt.nr_paths = 1;
313 opt.paths = &prefix; 321 opt.paths = &prefix;
314 prefixlen = strlen(prefix); 322 prefixlen = strlen(prefix);
315 opt.pathlens = &prefixlen; 323 opt.pathlens = &prefixlen;
316 } 324 }
317 diff_setup_done(&opt); 325 diff_setup_done(&opt);
318 326
319 if (old_sha1 && !is_null_sha1(old_sha1)) 327 if (old_sha1 && !is_null_sha1(old_sha1))
320 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 328 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
321 else 329 else
322 ret = diff_root_tree_sha1(new_sha1, "", &opt); 330 ret = diff_root_tree_sha1(new_sha1, "", &opt);
323 diffcore_std(&opt); 331 diffcore_std(&opt);
324 diff_flush(&opt); 332 diff_flush(&opt);
325} 333}
326 334
327void cgit_diff_commit(struct commit *commit, filepair_fn fn) 335void cgit_diff_commit(struct commit *commit, filepair_fn fn)
328{ 336{
329 unsigned char *old_sha1 = NULL; 337 unsigned char *old_sha1 = NULL;
330 338
331 if (commit->parents) 339 if (commit->parents)
332 old_sha1 = commit->parents->item->object.sha1; 340 old_sha1 = commit->parents->item->object.sha1;
333 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 341 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
334} 342}
335 343
336int cgit_parse_snapshots_mask(const char *str) 344int cgit_parse_snapshots_mask(const char *str)
337{ 345{
338 const struct cgit_snapshot_format *f; 346 const struct cgit_snapshot_format *f;
339 static const char *delim = " \t,:/|;"; 347 static const char *delim = " \t,:/|;";
340 int tl, sl, rv = 0; 348 int tl, sl, rv = 0;