Fixed CERT VU#238019 (make sure sasl_encode64() always NUL terminates output or returns SASL_BUFOVER)

Author: ksmurchison

ChangeLog

@@ -1,3 +1,7 @@
+2009-04-27  Ken Murchison <[email protected]>
+	* lib/saslutil.c: Fixed CERT VU#238019 (make sure sasl_encode64()
+	  always NUL terminates output or returns SASL_BUFOVER).
+
 2009-04-11  Alexey Melnikov <[email protected]>
 	* plugins/sql.c: Fixed SQLite lookup function.
 	  Also fixed SASL PLAIN authenticaion when used with

lib/saslutil.c

@@ -1,7 +1,7 @@
 /* saslutil.c
  * Rob Siemborski
  * Tim Martin
- * $Id: saslutil.c,v 1.48 2009/04/17 06:04:50 mel Exp $
+ * $Id: saslutil.c,v 1.49 2009/04/27 13:26:27 murch Exp $
  */
 /* 
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -137,7 +137,7 @@ int sasl_encode64(const char *_in,
     if (outlen) {
 	*outlen = olen;
     }
-    if (outmax < olen) {
+    if (outmax <= olen) {
 	return SASL_BUFOVER;
     }
 
@@ -162,9 +162,7 @@ int sasl_encode64(const char *_in,
         *out++ = '=';
     }
 
-    if (olen < outmax) {
-	*out = '\0';
-    }
+    *out = '\0';
 
     return SASL_OK;
 }