svn commit: samba r23454 - in branches/SAMBA_3_0_26/source/registry: .

[obnox at samba.org]

Author: obnox
Date: 2007-06-12 23:29:53 +0000 (Tue, 12 Jun 2007)
New Revision: 23454

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23454

Log:
Merge r20018 from 3_0:

Fix a memleak in reg_createkey


Modified:
   branches/SAMBA_3_0_26/source/registry/reg_api.c


Changeset:
Modified: branches/SAMBA_3_0_26/source/registry/reg_api.c
===================================================================
--- branches/SAMBA_3_0_26/source/registry/reg_api.c	2007-06-12 23:23:01 UTC (rev 23453)
+++ branches/SAMBA_3_0_26/source/registry/reg_api.c	2007-06-12 23:29:53 UTC (rev 23454)
@@ -320,8 +320,10 @@
 
 	err = reg_openkey(ctx, key, path, desired_access, pkey);
 	if (W_ERROR_IS_OK(err)) {
-		*paction = REG_OPENED_EXISTING_KEY;
-		return WERR_OK;
+		if (paction != NULL) {
+			*paction = REG_OPENED_EXISTING_KEY;
+		}
+		goto done;
 	}
 
 	if (!W_ERROR_EQUAL(err, WERR_BADFILE)) {