SOURCES: mutt-sasl-fixes.patch (NEW) - SASL fixes backported from ...

qboosh qboosh at pld-linux.org
Mon Aug 21 20:38:53 CEST 2006


Author: qboosh                       Date: Mon Aug 21 18:38:52 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- SASL fixes backported from 1.5.x (spotted by Mariusz Krynski)

---- Files affected:
SOURCES:
   mutt-sasl-fixes.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mutt-sasl-fixes.patch
diff -u /dev/null SOURCES/mutt-sasl-fixes.patch:1.1
--- /dev/null	Mon Aug 21 20:38:52 2006
+++ SOURCES/mutt-sasl-fixes.patch	Mon Aug 21 20:38:47 2006
@@ -0,0 +1,46 @@
+--- mutt-1.4.2.2/imap/auth_sasl.c.orig	2006-08-21 20:08:06.165971000 +0200
++++ mutt-1.4.2.2/imap/auth_sasl.c	2006-08-21 20:32:39.285971000 +0200
+@@ -32,7 +32,7 @@
+   sasl_conn_t* saslconn;
+   sasl_interact_t* interaction = NULL;
+   int rc, irc;
+-  char buf[LONG_STRING];
++  char buf[HUGE_STRING];
+   const char* mech;
+   const char* pc = NULL;
+   unsigned int len, olen;
+@@ -107,7 +107,7 @@
+     if (irc == IMAP_CMD_RESPOND)
+     {
+       if (sasl_decode64 (idata->cmd.buf+2, strlen (idata->cmd.buf+2), buf,
+-			 LONG_STRING,&len) != SASL_OK)
++			 LONG_STRING-1, &len) != SASL_OK)
+       {
+ 	dprint (1, (debugfile, "imap_auth_sasl: error base64-decoding server response.\n"));
+ 	goto bail;
+--- mutt-1.4.2.2/mutt_sasl.c.orig	2006-08-21 20:08:06.205971000 +0200
++++ mutt-1.4.2.2/mutt_sasl.c	2006-08-21 20:31:54.415971000 +0200
+@@ -383,7 +383,6 @@
+ 
+   /* release sasl resources */
+   sasl_dispose (&sasldata->saslconn);
+-  FREE (&sasldata->buf);
+   FREE (&sasldata);
+ 
+   /* call underlying close */
+@@ -415,7 +414,6 @@
+   
+   conn->sockdata = sasldata->sockdata;
+ 
+-  FREE (&sasldata->buf);
+   sasldata->bpos = 0;
+   sasldata->blen = 0;
+ 
+@@ -486,7 +484,6 @@
+       }
+ 
+       rc = (sasldata->write) (conn, pbuf, plen);
+-      FREE (&pbuf);
+       if (rc != plen)
+ 	goto fail;
+ 
================================================================


More information about the pld-cvs-commit mailing list