From: Luke Howard <lukeh@padl.com>
Date: Wed, 11 Jan 2012 05:56:39 +0000 (+1100)
Subject: fix order of operations merge regression
X-Git-Tag: 0.9.2~76^2~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=2aa0bf2fb0f52edd78a3bca9a03d92b69f9279ac;hp=-c;p=mech_eap.git

fix order of operations merge regression
---

2aa0bf2fb0f52edd78a3bca9a03d92b69f9279ac
diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp
index c76fffe..e152cd2 100644
--- a/mech_eap/util_radius.cpp
+++ b/mech_eap/util_radius.cpp
@@ -282,7 +282,7 @@ getAttributeId(const gss_buffer_t desc,
     canon = isdigit(*(char *)desc->value);
 
     /* need to duplicate because attr may not be NUL terminated */
-    strAttr = (char *)GSSEAP_MALLOC(canon ? 5 : 0 + desc->length + 1);
+    strAttr = (char *)GSSEAP_MALLOC((canon ? 5 : 0) + desc->length + 1);
     if (strAttr == NULL)
         throw new std::bad_alloc();