Date: Fri, 31 May 2002 06:41:51 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 12195 for review Message-ID: <200205311341.g4VDfpM19055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12195 Change 12195 by rwatson@rwatson_curry on 2002/05/31 06:40:52 Merge-o: resource freeing block got duplicated since it was present in both branches, and p4 "did the right thing" :-) Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 (text+ko) ==== @@ -516,25 +516,6 @@ vrele(tracevp); pargs_drop(oldargs); - /* - * Free any resources malloc'd earlier that we didn't use. - */ - if (newcred == NULL) - crfree(oldcred); - else - crfree(newcred); - KASSERT(newargs == NULL, ("leaking p_args")); - /* - * Handle deferred decrement of ref counts. - */ - if (textvp != NULL) - vrele(textvp); - if (textdvp != NULL) - vrele(textdvp); - if (tracevp != NULL) - vrele(tracevp); - pargs_drop(oldargs); - exec_fail_dealloc: /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205311341.g4VDfpM19055>