From: Samuel Just <samuel.just@dreamhost.com>
Date: Thu, 3 Feb 2011 20:20:22 +0000 (-0800)
Subject: auth/ExportControl: fix allow_def leak
X-Git-Tag: v0.25~231^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af9bc4fcfdbc0c3d63acbca58991075e6bcd963e;p=ceph.git

auth/ExportControl: fix allow_def leak

allow_def would be leaked if the first branch is not taken.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---

diff --git a/src/auth/ExportControl.cc b/src/auth/ExportControl.cc
index 23ba83c7854e..f1ff731a534a 100644
--- a/src/auth/ExportControl.cc
+++ b/src/auth/ExportControl.cc
@@ -617,7 +617,6 @@ void ExportControl::load(ConfFile *conf)
 			free(allow_str);
 		}
 	}
-	delete allow_def;
 	free(orig_tmp_sec);
     } else if ((strncmp(GROUP_SEC_NAME, (*p)->get_name().c_str(), grp_len) == 0) ||
         (strncmp(CLIENT_SEC_NAME, (*p)->get_name().c_str(), client_len) == 0)) {
@@ -640,6 +639,7 @@ void ExportControl::load(ConfFile *conf)
 	free(orig_tmp_sec);
     }
   }
+  free(allow_def);
 }
 
 bool ExportControl::is_authorized(entity_addr_t *addr, const char *path)