On Tue, Mar 06, 2007 at 04:19:43PM +0100, Steinar H. Gunderson wrote:
diff -ur e2fsprogs-1.39+1.40-WIP-2006.11.14+dfsg/lib/blkid/probe.c e2fsprogs-patched/lib/blkid/probe.c --- e2fsprogs-1.39+1.40-WIP-2006.11.14+dfsg/lib/blkid/probe.c 2006-09-18 03:12:28.000000000 +0200 +++ e2fsprogs-patched/lib/blkid/probe.c 2007-03-06 13:55:19.000000000 +0100 @@ -888,6 +888,10 @@ if (!dev->bid_type) { if (probe.fd >= 0) close(probe.fd); blkid_free_dev(dev); + if (probe.sbbuf) + free(probe.sbbuf); + if (probe.buf) + free(probe.buf); return NULL; }
Those if(probe.thingy) guards are entirely redundant: free(p) is a no-op if p is NULL. Phil -- http://www.kantaka.co.uk/ .oOo. public key: http://www.kantaka.co.uk/gpg.txt -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]