error path dbl free in cdiff.c

remotes/push_mirror/multihash
aCaB 15 years ago
parent 4f1cdbdddd
commit 9c5765ead4
  1. 5
      ChangeLog
  2. 12
      shared/cdiff.c

@ -1,3 +1,8 @@
Fri Dec 17 17:10:46 CET 2010 (acab)
-----------------------------------
* shared/cdiff.c: Fix error path double free - missed in 4bc4581d
thanks Michael Tautschnig <mt*debian.org>
Fri Dec 17 14:21:21 CET 2010 (acab)
-----------------------------------
* clamav-milter/whitelist.c, clamscan/manager.c, libclamav/sis.c:

@ -995,8 +995,16 @@ int cdiff_apply(int fd, unsigned short mode)
logg("!cdiff_apply: Can't resize line buffer to %d bytes\n", line_size);
cdiff_ctx_free(&ctx);
fclose(fh);
free(line);
free(lbuf);
if(!r1 && !r2) {
free(line);
free(lbuf);
} else if(!r1) {
free(line);
free(r2);
} else {
free(r1);
free(lbuf);
}
return -1;
}
line = r1;

Loading…
Cancel
Save